summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolly Ross <sross@redhat.com>2015-02-27 15:04:34 -0500
committerSolly Ross <sross@redhat.com>2015-02-27 17:13:33 -0500
commit7e161007abe8338afc501e907993bf5a72e085d9 (patch)
treeb0d580679e88142880fdecfeb4e9edd7835953cc
parent18c34c4766d70f39ec188d03c08cd83acbbd5222 (diff)
downloadnovnc-7e161007abe8338afc501e907993bf5a72e085d9.tar.gz
Launch Sauce Connect through Travis
This commit makes Travis launch sauce connect, instead of using karma to start Sauce Connect
-rw-r--r--.travis.yml2
-rw-r--r--karma.conf.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 371b974..8192252 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,3 +14,5 @@ env:
- secure: QE5GqGd2hrpQsIgd8dlv3oRUUHqZayomzzQjNXOB81VQi241uz/ru+3GtBZLB5WLZCq/Gj89vbLnR0LN4ixlmPaWv3/WJQGyDGuRD/vMnccVl+rBUP/Hh2zdYwiISIGcrywNAE+KLus/lyt/ahVgzbaRaDSzrM1HaZFT/rndGck=
- secure: g75sdctEwj0hoLW0Y08Tdv8s5scNzplB6a9EtaJ2vJD9S/bK+AsPqbWesGv1UlrFPCWdbV7Vg61vkmoUjcmb5xhqFIjcM9TlYJoKWeOTsOmnQoSIkIq6gMF1k02+LmKInbPgIzrp3m3jluS1qaOs/EzFpDnJp9hWBiAfXa12Jxk=
before_script: npm install -g karma-cli
+addons:
+ sauce_connect: true
diff --git a/karma.conf.js b/karma.conf.js
index 9893df6..d8b8e90 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -188,7 +188,7 @@ module.exports = function(config) {
my_conf.captureTimeout = 0; // use SL timeout
my_conf.sauceLabs = {
testName: 'noVNC Tests (all)',
- startConnect: true,
+ startConnect: false,
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER
};
}