Skip to content

Commit

Permalink
[core] fixing karma timeout error in travis (vmware-archive#666)
Browse files Browse the repository at this point in the history
Fixes vmware-archive#666.

Signed-off-by: Jeeyun Lim <jeeyun.lim@gmail.com>
  • Loading branch information
jeeyun committed Apr 25, 2017
1 parent 3737854 commit 6a2747b
Showing 1 changed file with 4 additions and 52 deletions.
56 changes: 4 additions & 52 deletions build/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,6 @@ module.exports = function (config) {
var dist = "dist/";
var src = "src/";

// Browsers to run on Sauce Labs
var customLaunchers = {
'SL_Chrome_Win_10': {
base: 'SauceLabs',
browserName: 'chrome',
version: 57,
platform: 'Windows 10'
},
'SL_IE_11': {
base: 'SauceLabs',
browserName: 'internet explorer',
version: '11',
platform: 'Windows 7'
},
'SL_IE_Edge_13': {
base: 'SauceLabs',
browserName: 'MicrosoftEdge',
version: '13',
platform: 'Windows 10'
},
'SL_IE_Edge_14': {
base: 'SauceLabs',
browserName: 'MicrosoftEdge',
version: '14',
platform: 'Windows 10'
},
'SL_FireFox_51_Win_10': {
base: 'SauceLabs',
browserName: 'firefox',
version: 51,
platform: 'Windows 10'
}
};

var configuration = {
basePath: '../',

Expand Down Expand Up @@ -117,28 +83,14 @@ module.exports = function (config) {
logLevel: config.LOG_INFO,
autoWatch: false,
browsers: ['PhantomJS'],
singleRun: true,
singleRun: false,
browserNoActivityTimeout: 100000,
captureTimeout: 120000,

// Sauce Labs configurations
customLaunchers: customLaunchers,

sauceLabs: {
testName: 'Clarity Unit Tests',
public: "public",
build: process.env.TRAVIS_JOB_NUMBER,
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
username: process.env.SAUCE_USERNAME,
accessKey: process.env.SAUCE_ACCESS_KEY,
startConnect: false
}
captureTimeout: 120000
}

// Only enable Sauce Labs for Travis CI
// Only use Chrome for Travis CI
if(process.env.TRAVIS && process.env.TEST_SUITE === "test") {
configuration.browsers = Object.keys(customLaunchers);
configuration.reporters = ['mocha', 'saucelabs'];
configuration.browsers = ['Chrome'];
}

config.set(configuration);
Expand Down

0 comments on commit 6a2747b

Please sign in to comment.