| karma.conf.js (material2-7.3.5) | : | karma.conf.js (material2-7.3.6) |
|---|
| | |
| skipping to change at line 71 | | skipping to change at line 71 |
|---|
| }, | | }, |
| | |
| browserStack: { | | browserStack: { |
| project: 'Angular Material Unit Tests', | | project: 'Angular Material Unit Tests', |
| startTunnel: false, | | startTunnel: false, |
| retryLimit: 3, | | retryLimit: 3, |
| timeout: 1800, | | timeout: 1800, |
| video: false, | | video: false, |
| }, | | }, |
| | |
|
| browserDisconnectTimeout: 180000, | | browserDisconnectTolerance: 1, |
| browserDisconnectTolerance: 3, | | |
| browserNoActivityTimeout: 300000, | | browserNoActivityTimeout: 300000, |
|
| captureTimeout: 180000, | | |
| | |
| browsers: ['ChromeHeadlessLocal'], | | browsers: ['ChromeHeadlessLocal'], |
| singleRun: false, | | singleRun: false, |
| | |
| // Try Websocket for a faster transmission first. Fallback to polling if nec
essary. | | // Try Websocket for a faster transmission first. Fallback to polling if nec
essary. |
| transports: ['websocket', 'polling'], | | transports: ['websocket', 'polling'], |
| | |
| browserConsoleLogOptions: { | | browserConsoleLogOptions: { |
| terminal: true, | | terminal: true, |
| level: 'log' | | level: 'log' |
| | |
| skipping to change at line 129 | | skipping to change at line 127 |
|---|
| config.browserStack.build = buildIdentifier; | | config.browserStack.build = buildIdentifier; |
| config.browserStack.tunnelIdentifier = tunnelIdentifier; | | config.browserStack.tunnelIdentifier = tunnelIdentifier; |
| } else if (testPlatform === 'saucelabs') { | | } else if (testPlatform === 'saucelabs') { |
| config.sauceLabs.build = buildIdentifier; | | config.sauceLabs.build = buildIdentifier; |
| config.sauceLabs.tunnelIdentifier = tunnelIdentifier; | | config.sauceLabs.tunnelIdentifier = tunnelIdentifier; |
| // Setup the saucelabs reporter so that we report back to Saucelabs once | | // Setup the saucelabs reporter so that we report back to Saucelabs once |
| // our tests finished. | | // our tests finished. |
| config.reporters.push('saucelabs'); | | config.reporters.push('saucelabs'); |
| } | | } |
| | |
|
| | // If the test platform is not "local", browsers are launched externally and |
| | can take |
| | // up more time to capture. Also the connection can be flaky and therefore n |
| | eeds a |
| | // higher disconnect timeout. |
| | if (testPlatform !== 'local') { |
| | config.browserDisconnectTimeout = 180000; |
| | config.browserDisconnectTolerance = 3; |
| | config.captureTimeout = 180000; |
| | } |
| | |
| const platformBrowsers = platformMap[testPlatform]; | | const platformBrowsers = platformMap[testPlatform]; |
| const browserInstanceChunks = splitBrowsersIntoInstances( | | const browserInstanceChunks = splitBrowsersIntoInstances( |
| platformBrowsers, maxParallelContainerInstances); | | platformBrowsers, maxParallelContainerInstances); |
| | |
| // Configure Karma to launch the browsers that belong to the given test plat
form and | | // Configure Karma to launch the browsers that belong to the given test plat
form and |
| // container instance. | | // container instance. |
| config.browsers = browserInstanceChunks[containerInstanceIndex]; | | config.browsers = browserInstanceChunks[containerInstanceIndex]; |
| } | | } |
| }; | | }; |
| | |
| | | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 12 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 