Skip to content

Commit 6d39c2b

Browse files
committed
Change e2e timeouts
- Relates #401
1 parent d05d829 commit 6d39c2b

File tree

3 files changed

+53
-34
lines changed

3 files changed

+53
-34
lines changed

e2e/spring-shell-e2e-tests/src/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ export const nativeCommand = cliPath;
1818
export const jarOptions = ['-jar', jarPath];
1919
export const waitForExpectDefaultTimeout = 10000;
2020
export const waitForExpectDefaultInterval = 100;
21+
export const testTimeout = 20000;

e2e/spring-shell-e2e-tests/test/builtin.test.ts

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import {
88
nativeCommand,
99
jarOptions,
1010
waitForExpectDefaultTimeout,
11-
waitForExpectDefaultInterval
11+
waitForExpectDefaultInterval,
12+
testTimeout
1213
} from '../src/utils';
1314

1415
// all buildin commands
@@ -34,11 +35,11 @@ describe('builtin commands', () => {
3435
beforeEach(async () => {
3536
waitForExpect.defaults.timeout = waitForExpectDefaultTimeout;
3637
waitForExpect.defaults.interval = waitForExpectDefaultInterval;
37-
}, 300000);
38+
}, testTimeout);
3839

3940
afterEach(async () => {
4041
cli?.dispose();
41-
}, 100000);
42+
}, testTimeout);
4243

4344
/**
4445
* native commands
@@ -48,13 +49,17 @@ describe('builtin commands', () => {
4849
command = nativeCommand;
4950
});
5051

51-
it(versionReturnsInfoDesc, async () => {
52-
cli = new Cli({
53-
command: command,
54-
options: [...options, ...versionCommand]
55-
});
56-
await versionReturnsInfo(cli);
57-
});
52+
it(
53+
versionReturnsInfoDesc,
54+
async () => {
55+
cli = new Cli({
56+
command: command,
57+
options: [...options, ...versionCommand]
58+
});
59+
await versionReturnsInfo(cli);
60+
},
61+
testTimeout
62+
);
5863
});
5964

6065
/**
@@ -66,12 +71,16 @@ describe('builtin commands', () => {
6671
options = jarOptions;
6772
});
6873

69-
it(versionReturnsInfoDesc, async () => {
70-
cli = new Cli({
71-
command: command,
72-
options: [...options, ...versionCommand]
73-
});
74-
await versionReturnsInfo(cli);
75-
});
74+
it(
75+
versionReturnsInfoDesc,
76+
async () => {
77+
cli = new Cli({
78+
command: command,
79+
options: [...options, ...versionCommand]
80+
});
81+
await versionReturnsInfo(cli);
82+
},
83+
testTimeout
84+
);
7685
});
7786
});

e2e/spring-shell-e2e-tests/test/flow.test.ts

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import {
88
nativeCommand,
99
jarOptions,
1010
waitForExpectDefaultTimeout,
11-
waitForExpectDefaultInterval
11+
waitForExpectDefaultInterval,
12+
testTimeout
1213
} from '../src/utils';
1314

1415
// all flow commands
@@ -56,11 +57,11 @@ describe('flow commands', () => {
5657
beforeEach(async () => {
5758
waitForExpect.defaults.timeout = waitForExpectDefaultTimeout;
5859
waitForExpect.defaults.interval = waitForExpectDefaultInterval;
59-
}, 300000);
60+
}, testTimeout);
6061

6162
afterEach(async () => {
6263
cli?.dispose();
63-
}, 100000);
64+
}, testTimeout);
6465

6566
/**
6667
* native commands
@@ -70,13 +71,17 @@ describe('flow commands', () => {
7071
command = nativeCommand;
7172
});
7273

73-
it(flowConditionalField2SkipsFields1Desc, async () => {
74-
cli = new Cli({
75-
command: command,
76-
options: [...options, ...flowConditionalCommand]
77-
});
78-
await flowConditionalField2SkipsFields1(cli);
79-
});
74+
it(
75+
flowConditionalField2SkipsFields1Desc,
76+
async () => {
77+
cli = new Cli({
78+
command: command,
79+
options: [...options, ...flowConditionalCommand]
80+
});
81+
await flowConditionalField2SkipsFields1(cli);
82+
},
83+
testTimeout
84+
);
8085
});
8186

8287
/**
@@ -88,12 +93,16 @@ describe('flow commands', () => {
8893
options = jarOptions;
8994
});
9095

91-
it(flowConditionalField2SkipsFields1Desc, async () => {
92-
cli = new Cli({
93-
command: command,
94-
options: [...options, ...flowConditionalCommand]
95-
});
96-
await flowConditionalField2SkipsFields1(cli);
97-
});
96+
it(
97+
flowConditionalField2SkipsFields1Desc,
98+
async () => {
99+
cli = new Cli({
100+
command: command,
101+
options: [...options, ...flowConditionalCommand]
102+
});
103+
await flowConditionalField2SkipsFields1(cli);
104+
},
105+
testTimeout
106+
);
98107
});
99108
});

0 commit comments

Comments
 (0)