Skip to content

Commit

Permalink
refactor: more time given to rebuilds (#4509)
Browse files Browse the repository at this point in the history
Apparently travis is still flaky with 5 seconds.
  • Loading branch information
hansl authored Feb 8, 2017
1 parent 4ce2ea7 commit d43fa14
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions tests/e2e/tests/build/rebuild-css-change.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/tests/build/rebuild-deps-type-check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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', `
Expand All @@ -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.');
Expand All @@ -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.');
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/tests/build/rebuild.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit d43fa14

Please sign in to comment.