Skip to content

Commit de973b8

Browse files
hanslMRHarrison
authored andcommitted
refactor: more time given to rebuilds (angular#4509)
Apparently travis is still flaky with 5 seconds.
1 parent fbd19e3 commit de973b8

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

tests/e2e/tests/build/rebuild-css-change.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ export default function() {
1717
return silentExecAndWaitForOutputToMatch('ng', ['serve'], webpackGoodRegEx)
1818
// Should trigger a rebuild.
1919
.then(() => exec('touch', 'src/main.ts'))
20-
.then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 5000))
21-
.then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 5000))
20+
.then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 10000))
21+
.then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 10000))
2222
.then(() => appendToFile('src/app/app.component.css', ':host { color: blue; }'))
23-
.then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 5000))
24-
.then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 5000))
23+
.then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 10000))
24+
.then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 10000))
2525
.then(() => killAllProcesses(), (err: any) => {
2626
killAllProcesses();
2727
throw err;

tests/e2e/tests/build/rebuild-deps-type-check.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default function() {
3434
console.log(funky('town'));
3535
`))
3636
// Should trigger a rebuild, no error expected.
37-
.then(() => waitForAnyProcessOutputToMatch(doneRe, 5000))
37+
.then(() => waitForAnyProcessOutputToMatch(doneRe, 10000))
3838
// Create and import files.
3939
.then(() => wait(2000))
4040
.then(() => writeFile('src/funky2.ts', `
@@ -43,7 +43,7 @@ export default function() {
4343
}
4444
`))
4545
// Should trigger a rebuild, this time an error is expected.
46-
.then(() => waitForAnyProcessOutputToMatch(doneRe, 5000))
46+
.then(() => waitForAnyProcessOutputToMatch(doneRe, 10000))
4747
.then(({ stdout }) => {
4848
if (!/ERROR in .*\/src\/main\.ts \(/.test(stdout)) {
4949
throw new Error('Expected an error but none happened.');
@@ -55,7 +55,7 @@ export default function() {
5555
return value + 'hello';
5656
}
5757
`))
58-
.then(() => waitForAnyProcessOutputToMatch(doneRe, 5000))
58+
.then(() => waitForAnyProcessOutputToMatch(doneRe, 10000))
5959
.then(({ stdout }) => {
6060
if (/ERROR in .*\/src\/main\.ts \(/.test(stdout)) {
6161
throw new Error('Expected no error but an error was shown.');

tests/e2e/tests/build/rebuild.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ export default function() {
2222
// Should trigger a rebuild.
2323
.then(() => exec('touch', 'src/main.ts'))
2424
.then(() => waitForAnyProcessOutputToMatch(
25-
/webpack: bundle is now INVALID|webpack: Compiling.../, 5000))
25+
/webpack: bundle is now INVALID|webpack: Compiling.../, 10000))
2626
.then(() => waitForAnyProcessOutputToMatch(
27-
/webpack: bundle is now VALID|webpack: Compiled successfully./, 5000))
27+
/webpack: bundle is now VALID|webpack: Compiled successfully./, 10000))
2828
// Count the bundles.
2929
.then(({ stdout }) => {
3030
oldNumberOfChunks = stdout.split(chunkRegExp).length;
@@ -61,9 +61,9 @@ export default function() {
6161
`))
6262
// Should trigger a rebuild with a new bundle.
6363
.then(() => waitForAnyProcessOutputToMatch(
64-
/webpack: bundle is now INVALID|webpack: Compiling.../, 5000))
64+
/webpack: bundle is now INVALID|webpack: Compiling.../, 10000))
6565
.then(() => waitForAnyProcessOutputToMatch(
66-
/webpack: bundle is now VALID|webpack: Compiled successfully./, 5000))
66+
/webpack: bundle is now VALID|webpack: Compiled successfully./, 10000))
6767
// Count the bundles.
6868
.then(({ stdout }) => {
6969
let newNumberOfChunks = stdout.split(chunkRegExp).length;

0 commit comments

Comments
 (0)