Skip to content

Commit 4acb8e2

Browse files
committed
fix: Use CHROME_BIN
1 parent 4699491 commit 4acb8e2

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ before_script:
120120
- echo "export SPARK_HOME=`pwd`/spark-$SPARK_VER-bin-hadoop$HADOOP_VER" > conf/zeppelin-env.sh
121121
- echo "export ZEPPELIN_HELIUM_REGISTRY=helium" >> conf/zeppelin-env.sh
122122
- tail conf/zeppelin-env.sh
123-
- export DISPLAY=:99.0 # required to execute e2e tests in chrome
124-
- sh -e /etc/init.d/xvfb start # required to execute e2e tests in chrome
123+
- if [[ -n $TEST_MODULES ]]; then export CHROME_BIN=chromium-browser; export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi
125124

126125
script:
127126
- if [[ -n $TEST_MODULES ]]; then export MODULES=$TEST_MODULES; fi

zeppelin-web/protractor.conf.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
exports.config = {
1+
var baseConfig = {
22
baseUrl: 'http://localhost:8080/',
33
directConnect: true,
44
// chromeOnly: true,
@@ -24,7 +24,6 @@ exports.config = {
2424
browser.manage().timeouts().pageLoadTimeout(80000);
2525
browser.manage().timeouts().implicitlyWait(50000);
2626

27-
2827
// add reporter to display executed tests in console
2928
var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
3029
jasmine.getEnv().addReporter(new SpecReporter({
@@ -34,3 +33,9 @@ exports.config = {
3433
}));
3534
},
3635
};
36+
37+
if (process.env.TRAVIS) {
38+
baseConfig.binary = process.env.CHROME_BIN
39+
}
40+
41+
exports.config = baseConfig;

0 commit comments

Comments
 (0)