Skip to content

Commit eced463

Browse files
zhiyuanliang-mszhiyuanliang-ms
committed
centralize timeout
1 parent ddf3d60 commit eced463

10 files changed

+24
-18
lines changed

‎test/clientOptions.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
66
chai.use(chaiAsPromised);
77
const expect = chai.expect;
88
import { load } from "./exportedApi.js";
9-
import { createMockedConnectionString } from "./utils/testHelper.js";
9+
import { MAX_TIME_OUT, createMockedConnectionString } from "./utils/testHelper.js";
1010
import * as nock from "nock";
1111

1212
class HttpRequestCountPolicy {
@@ -27,7 +27,7 @@ class HttpRequestCountPolicy {
2727
}
2828

2929
describe("custom client options", function () {
30-
this.timeout(15000);
30+
this.timeout(MAX_TIME_OUT);
3131

3232
const fakeEndpoint = "https://azure.azconfig.io";
3333
beforeEach(() => {

‎test/failover.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
66
chai.use(chaiAsPromised);
77
const expect = chai.expect;
88
import { load } from "./exportedApi";
9-
import { createMockedConnectionString, createMockedFeatureFlag, createMockedKeyValue, mockConfigurationManagerGetClients, restoreMocks } from "./utils/testHelper";
9+
import { MAX_TIME_OUT, createMockedConnectionString, createMockedFeatureFlag, createMockedKeyValue, mockConfigurationManagerGetClients, restoreMocks } from "./utils/testHelper";
1010
import { getValidDomain, isValidEndpoint } from "../src/ConfigurationClientManager";
1111

1212
const mockedKVs = [{
@@ -27,7 +27,7 @@ const mockedFeatureFlags = [{
2727
]);
2828

2929
describe("failover", function () {
30-
this.timeout(15000);
30+
this.timeout(MAX_TIME_OUT);
3131

3232
afterEach(() => {
3333
restoreMocks();

‎test/featureFlag.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import * as chai from "chai";
55
import * as chaiAsPromised from "chai-as-promised";
66
import { load } from "./exportedApi.js";
7-
import { createMockedConnectionString, createMockedEndpoint, createMockedFeatureFlag, createMockedKeyValue, mockAppConfigurationClientListConfigurationSettings, restoreMocks } from "./utils/testHelper.js";
7+
import { MAX_TIME_OUT, createMockedConnectionString, createMockedEndpoint, createMockedFeatureFlag, createMockedKeyValue, mockAppConfigurationClientListConfigurationSettings, restoreMocks } from "./utils/testHelper.js";
88
chai.use(chaiAsPromised);
99
const expect = chai.expect;
1010

@@ -199,7 +199,7 @@ const mockedKVs = [{
199199
]);
200200

201201
describe("feature flags", function () {
202-
this.timeout(10000);
202+
this.timeout(MAX_TIME_OUT);
203203

204204
before(() => {
205205
mockAppConfigurationClientListConfigurationSettings([mockedKVs]);

‎test/json.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ import * as chaiAsPromised from "chai-as-promised";
66
chai.use(chaiAsPromised);
77
const expect = chai.expect;
88
import { load } from "./exportedApi.js";
9-
import { mockAppConfigurationClientListConfigurationSettings, restoreMocks, createMockedConnectionString, createMockedKeyVaultReference, createMockedJsonKeyValue } from "./utils/testHelper.js";
9+
import { MAX_TIME_OUT, mockAppConfigurationClientListConfigurationSettings, restoreMocks, createMockedConnectionString, createMockedKeyVaultReference, createMockedJsonKeyValue } from "./utils/testHelper.js";
1010

1111
const jsonKeyValue = createMockedJsonKeyValue("json.settings.logging", '{"Test":{"Level":"Debug"},"Prod":{"Level":"Warning"}}');
1212
const keyVaultKeyValue = createMockedKeyVaultReference("TestKey", "https://fake-vault-name.vault.azure.net/secrets/fakeSecretName");
1313

1414
describe("json", function () {
15+
this.timeout(MAX_TIME_OUT);
16+
1517
beforeEach(() => {
1618
});
1719

‎test/keyvault.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
66
chai.use(chaiAsPromised);
77
const expect = chai.expect;
88
import { load } from "./exportedApi.js";
9-
import { sinon, createMockedConnectionString, createMockedTokenCredential, mockAppConfigurationClientListConfigurationSettings, mockSecretClientGetSecret, restoreMocks, createMockedKeyVaultReference } from "./utils/testHelper.js";
9+
import { MAX_TIME_OUT, sinon, createMockedConnectionString, createMockedTokenCredential, mockAppConfigurationClientListConfigurationSettings, mockSecretClientGetSecret, restoreMocks, createMockedKeyVaultReference } from "./utils/testHelper.js";
1010
import { KeyVaultSecret, SecretClient } from "@azure/keyvault-secrets";
1111

1212
const mockedData = [
@@ -27,7 +27,7 @@ function mockNewlyCreatedKeyVaultSecretClients() {
2727
mockSecretClientGetSecret(mockedData.map(([_key, secretUri, value]) => [secretUri, value]));
2828
}
2929
describe("key vault reference", function () {
30-
this.timeout(10000);
30+
this.timeout(MAX_TIME_OUT);
3131

3232
beforeEach(() => {
3333
mockAppConfigurationClient();

‎test/load.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
66
chai.use(chaiAsPromised);
77
const expect = chai.expect;
88
import { load } from "./exportedApi.js";
9-
import { mockAppConfigurationClientListConfigurationSettings, restoreMocks, createMockedConnectionString, createMockedEndpoint, createMockedTokenCredential, createMockedKeyValue } from "./utils/testHelper.js";
9+
import { MAX_TIME_OUT, mockAppConfigurationClientListConfigurationSettings, restoreMocks, createMockedConnectionString, createMockedEndpoint, createMockedTokenCredential, createMockedKeyValue } from "./utils/testHelper.js";
1010

1111
const mockedKVs = [{
1212
key: "app.settings.fontColor",
@@ -77,7 +77,7 @@ const mockedKVs = [{
7777
].map(createMockedKeyValue);
7878

7979
describe("load", function () {
80-
this.timeout(10000);
80+
this.timeout(MAX_TIME_OUT);
8181

8282
before(() => {
8383
mockAppConfigurationClientListConfigurationSettings([mockedKVs]);

‎test/loadBalance.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
66
chai.use(chaiAsPromised);
77
const expect = chai.expect;
88
import { load } from "./exportedApi.js";
9-
import { restoreMocks, createMockedConnectionString, sleepInMs, createMockedEndpoint, mockConfigurationManagerGetClients, mockAppConfigurationClientLoadBalanceMode } from "./utils/testHelper.js";
9+
import { MAX_TIME_OUT, restoreMocks, createMockedConnectionString, sleepInMs, createMockedEndpoint, mockConfigurationManagerGetClients, mockAppConfigurationClientLoadBalanceMode } from "./utils/testHelper.js";
1010
import { AppConfigurationClient } from "@azure/app-configuration";
1111
import { ConfigurationClientWrapper } from "../src/ConfigurationClientWrapper.js";
1212

@@ -18,7 +18,7 @@ const clientRequestCounter_1 = {count: 0};
1818
const clientRequestCounter_2 = {count: 0};
1919

2020
describe("load balance", function () {
21-
this.timeout(10000);
21+
this.timeout(MAX_TIME_OUT);
2222

2323
beforeEach(() => {
2424
});

‎test/refresh.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
66
chai.use(chaiAsPromised);
77
const expect = chai.expect;
88
import { load } from "./exportedApi.js";
9-
import { mockAppConfigurationClientListConfigurationSettings, mockAppConfigurationClientGetConfigurationSetting, restoreMocks, createMockedConnectionString, createMockedKeyValue, sleepInMs, createMockedFeatureFlag } from "./utils/testHelper.js";
9+
import { MAX_TIME_OUT, mockAppConfigurationClientListConfigurationSettings, mockAppConfigurationClientGetConfigurationSetting, restoreMocks, createMockedConnectionString, createMockedKeyValue, sleepInMs, createMockedFeatureFlag } from "./utils/testHelper.js";
1010
import * as uuid from "uuid";
1111

1212
let mockedKVs: any[] = [];
@@ -33,7 +33,7 @@ const getKvCallback = () => {
3333
};
3434

3535
describe("dynamic refresh", function () {
36-
this.timeout(10000);
36+
this.timeout(MAX_TIME_OUT);
3737

3838
beforeEach(() => {
3939
mockedKVs = [

‎test/requestTracing.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as chai from "chai";
55
import * as chaiAsPromised from "chai-as-promised";
66
chai.use(chaiAsPromised);
77
const expect = chai.expect;
8-
import { createMockedConnectionString, createMockedKeyValue, createMockedTokenCredential, mockAppConfigurationClientListConfigurationSettings, restoreMocks, sleepInMs } from "./utils/testHelper.js";
8+
import { MAX_TIME_OUT, createMockedConnectionString, createMockedKeyValue, createMockedTokenCredential, mockAppConfigurationClientListConfigurationSettings, restoreMocks, sleepInMs } from "./utils/testHelper.js";
99
import { load } from "./exportedApi.js";
1010

1111
class HttpRequestHeadersPolicy {
@@ -23,7 +23,7 @@ class HttpRequestHeadersPolicy {
2323
}
2424

2525
describe("request tracing", function () {
26-
this.timeout(15000);
26+
this.timeout(MAX_TIME_OUT);
2727

2828
const fakeEndpoint = "https://127.0.0.1"; // sufficient to test the request it sends out
2929
const headerPolicy = new HttpRequestHeadersPolicy();

‎test/utils/testHelper.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import * as crypto from "crypto";
1313
import { ConfigurationClientManager } from "../../src/ConfigurationClientManager";
1414
import { ConfigurationClientWrapper } from "../../src/ConfigurationClientWrapper";
1515

16+
const MAX_TIME_OUT = 20000;
17+
1618
const TEST_CLIENT_ID = "00000000-0000-0000-0000-000000000000";
1719
const TEST_TENANT_ID = "00000000-0000-0000-0000-000000000000";
1820
const TEST_CLIENT_SECRET = "0000000000000000000000000000000000000000";
@@ -262,5 +264,7 @@ export {
262264
createMockedKeyValue,
263265
createMockedFeatureFlag,
264266

265-
sleepInMs
267+
sleepInMs,
268+
269+
MAX_TIME_OUT
266270
};

0 commit comments

Comments
 (0)