mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
fix: Use CHROME_BIN
This commit is contained in:
parent
46994918e4
commit
4acb8e22b1
2 changed files with 8 additions and 4 deletions
|
|
@ -120,8 +120,7 @@ before_script:
|
|||
- echo "export SPARK_HOME=`pwd`/spark-$SPARK_VER-bin-hadoop$HADOOP_VER" > conf/zeppelin-env.sh
|
||||
- echo "export ZEPPELIN_HELIUM_REGISTRY=helium" >> conf/zeppelin-env.sh
|
||||
- tail conf/zeppelin-env.sh
|
||||
- export DISPLAY=:99.0 # required to execute e2e tests in chrome
|
||||
- sh -e /etc/init.d/xvfb start # required to execute e2e tests in chrome
|
||||
- if [[ -n $TEST_MODULES ]]; then export CHROME_BIN=chromium-browser; export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi
|
||||
|
||||
script:
|
||||
- if [[ -n $TEST_MODULES ]]; then export MODULES=$TEST_MODULES; fi
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
exports.config = {
|
||||
var baseConfig = {
|
||||
baseUrl: 'http://localhost:8080/',
|
||||
directConnect: true,
|
||||
// chromeOnly: true,
|
||||
|
|
@ -24,7 +24,6 @@ exports.config = {
|
|||
browser.manage().timeouts().pageLoadTimeout(80000);
|
||||
browser.manage().timeouts().implicitlyWait(50000);
|
||||
|
||||
|
||||
// add reporter to display executed tests in console
|
||||
var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
|
||||
jasmine.getEnv().addReporter(new SpecReporter({
|
||||
|
|
@ -34,3 +33,9 @@ exports.config = {
|
|||
}));
|
||||
},
|
||||
};
|
||||
|
||||
if (process.env.TRAVIS) {
|
||||
baseConfig.binary = process.env.CHROME_BIN
|
||||
}
|
||||
|
||||
exports.config = baseConfig;
|
||||
|
|
|
|||
Loading…
Reference in a new issue