diff options
| author | Vojta Jina | 2013-12-03 17:55:52 -0800 |
|---|---|---|
| committer | Vojta Jina | 2013-12-03 19:32:32 -0800 |
| commit | 9a81b8668a9ee13cdea305d85325efa3efdfc01e (patch) | |
| tree | ff8af8a2ddef1cc2e79ac145ddf0479d0dc7586d | |
| parent | 9481d69d1cd4c5431a60bcb2c0cfa5e01dcbb34f (diff) | |
| download | angular.js-9a81b8668a9ee13cdea305d85325efa3efdfc01e.tar.bz2 | |
chore(travis): give browsers more time to respond
| -rw-r--r-- | karma-e2e.conf.js | 4 | ||||
| -rw-r--r-- | karma-shared.conf.js | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/karma-e2e.conf.js b/karma-e2e.conf.js index 3d839a33..c1e066a8 100644 --- a/karma-e2e.conf.js +++ b/karma-e2e.conf.js @@ -20,6 +20,8 @@ module.exports = function(config) { junitReporter: { outputFile: 'test_out/e2e.xml', suite: 'E2E' - } + }, + + browserNoActivityTimeout: 90000 }); }; diff --git a/karma-shared.conf.js b/karma-shared.conf.js index f4b8cf93..b74b4910 100644 --- a/karma-shared.conf.js +++ b/karma-shared.conf.js @@ -7,6 +7,7 @@ module.exports = function(config, specificOptions) { browsers: ['Chrome'], browserDisconnectTimeout: 10000, browserDisconnectTolerance: 2, + browserNoActivityTimeout: 20000, // SauceLabs config for local development. |