From d43fa14a99ce38365062cde774a99d03590ffb92 Mon Sep 17 00:00:00 2001 From: Hans Date: Tue, 7 Feb 2017 18:59:03 -0800 Subject: [PATCH] refactor: more time given to rebuilds (#4509) Apparently travis is still flaky with 5 seconds. --- tests/e2e/tests/build/rebuild-css-change.ts | 8 ++++---- tests/e2e/tests/build/rebuild-deps-type-check.ts | 6 +++--- tests/e2e/tests/build/rebuild.ts | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/e2e/tests/build/rebuild-css-change.ts b/tests/e2e/tests/build/rebuild-css-change.ts index 666334ded735..ebdf0b9ebb4f 100644 --- a/tests/e2e/tests/build/rebuild-css-change.ts +++ b/tests/e2e/tests/build/rebuild-css-change.ts @@ -17,11 +17,11 @@ export default function() { return silentExecAndWaitForOutputToMatch('ng', ['serve'], webpackGoodRegEx) // Should trigger a rebuild. .then(() => exec('touch', 'src/main.ts')) - .then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 5000)) - .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 5000)) + .then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 10000)) + .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 10000)) .then(() => appendToFile('src/app/app.component.css', ':host { color: blue; }')) - .then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 5000)) - .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 5000)) + .then(() => waitForAnyProcessOutputToMatch(webpackBadRegEx, 10000)) + .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 10000)) .then(() => killAllProcesses(), (err: any) => { killAllProcesses(); throw err; diff --git a/tests/e2e/tests/build/rebuild-deps-type-check.ts b/tests/e2e/tests/build/rebuild-deps-type-check.ts index 24d8efba84fb..55a15ad4b2a3 100644 --- a/tests/e2e/tests/build/rebuild-deps-type-check.ts +++ b/tests/e2e/tests/build/rebuild-deps-type-check.ts @@ -34,7 +34,7 @@ export default function() { console.log(funky('town')); `)) // Should trigger a rebuild, no error expected. - .then(() => waitForAnyProcessOutputToMatch(doneRe, 5000)) + .then(() => waitForAnyProcessOutputToMatch(doneRe, 10000)) // Create and import files. .then(() => wait(2000)) .then(() => writeFile('src/funky2.ts', ` @@ -43,7 +43,7 @@ export default function() { } `)) // Should trigger a rebuild, this time an error is expected. - .then(() => waitForAnyProcessOutputToMatch(doneRe, 5000)) + .then(() => waitForAnyProcessOutputToMatch(doneRe, 10000)) .then(({ stdout }) => { if (!/ERROR in .*\/src\/main\.ts \(/.test(stdout)) { throw new Error('Expected an error but none happened.'); @@ -55,7 +55,7 @@ export default function() { return value + 'hello'; } `)) - .then(() => waitForAnyProcessOutputToMatch(doneRe, 5000)) + .then(() => waitForAnyProcessOutputToMatch(doneRe, 10000)) .then(({ stdout }) => { if (/ERROR in .*\/src\/main\.ts \(/.test(stdout)) { throw new Error('Expected no error but an error was shown.'); diff --git a/tests/e2e/tests/build/rebuild.ts b/tests/e2e/tests/build/rebuild.ts index a26385cb5934..eb2610f07d06 100644 --- a/tests/e2e/tests/build/rebuild.ts +++ b/tests/e2e/tests/build/rebuild.ts @@ -22,9 +22,9 @@ export default function() { // Should trigger a rebuild. .then(() => exec('touch', 'src/main.ts')) .then(() => waitForAnyProcessOutputToMatch( - /webpack: bundle is now INVALID|webpack: Compiling.../, 5000)) + /webpack: bundle is now INVALID|webpack: Compiling.../, 10000)) .then(() => waitForAnyProcessOutputToMatch( - /webpack: bundle is now VALID|webpack: Compiled successfully./, 5000)) + /webpack: bundle is now VALID|webpack: Compiled successfully./, 10000)) // Count the bundles. .then(({ stdout }) => { oldNumberOfChunks = stdout.split(chunkRegExp).length; @@ -61,9 +61,9 @@ export default function() { `)) // Should trigger a rebuild with a new bundle. .then(() => waitForAnyProcessOutputToMatch( - /webpack: bundle is now INVALID|webpack: Compiling.../, 5000)) + /webpack: bundle is now INVALID|webpack: Compiling.../, 10000)) .then(() => waitForAnyProcessOutputToMatch( - /webpack: bundle is now VALID|webpack: Compiled successfully./, 5000)) + /webpack: bundle is now VALID|webpack: Compiled successfully./, 10000)) // Count the bundles. .then(({ stdout }) => { let newNumberOfChunks = stdout.split(chunkRegExp).length;