Repository: zeppelin
Updated Branches:
  refs/heads/master 4fc048238 -> f4a798b62


[ZEPPELIN-3306] Web e2e test fails

### What is this PR for?
This is one of the flaky tests that fails with "should have a welcome message" 
because Z-Server did not start by the time test started executing.

### What type of PR is it?
[Bug Fix]

### What is the Jira issue?
* [ZEPPELIN-3306](https://issues.apache.org/jira/browse/ZEPPELIN-3306)

### How should this be tested?
* CI should pass

### Questions:
* Does the licenses files need update? N/A
* Is there breaking changes for older versions? N/A
* Does this needs documentation? N/A

Author: Prabhjyot Singh <prabhjyotsi...@gmail.com>

Closes #2853 from prabhjyotsingh/ZEPPELIN-3306 and squashes the following 
commits:

38a4297 [Prabhjyot Singh] upgrade chrome=2.35
f82a00a [Prabhjyot Singh] set spawn as false for both zeppelin-web and 
zeppelin-integration
8742b11 [Prabhjyot Singh] ZEPPELIN-3306: Web e2e test fails


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f4a798b6
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f4a798b6
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f4a798b6

Branch: refs/heads/master
Commit: f4a798b6230b4f2389ad7ea9b41818b15d9ab5a7
Parents: 4fc0482
Author: Prabhjyot Singh <prabhjyotsi...@gmail.com>
Authored: Fri Mar 9 15:45:10 2018 +0530
Committer: Prabhjyot Singh <prabhjyotsi...@gmail.com>
Committed: Sat Mar 10 13:58:04 2018 +0530

----------------------------------------------------------------------
 .travis.yml                  | 4 ++--
 zeppelin-integration/pom.xml | 2 +-
 zeppelin-web/package.json    | 2 +-
 zeppelin-web/pom.xml         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f4a798b6/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 24476fb..e113ae3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ matrix:
       sudo: false
       dist: trusty
       jdk: "oraclejdk8"
-      env: PYTHON="2" WEB_E2E="true" SCALA_VER="2.11" SPARK_VER="2.1.0" 
HADOOP_VER="2.6" PROFILE="-Phadoop2 -Pscala-2.11" BUILD_FLAG="package 
-DskipTests -DskipRat" TEST_FLAG="verify -DskipRat" MODULES="-pl 
${INTERPRETERS}" TEST_MODULES="-pl zeppelin-web" TEST_PROJECTS="-Pweb-e2e"
+      env: CI="true" WEB_E2E="true" PYTHON="2" SCALA_VER="2.11" 
SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Phadoop2 -Pscala-2.11" 
BUILD_FLAG="package -DskipTests -DskipRat" TEST_FLAG="verify -DskipRat" 
MODULES="-pl ${INTERPRETERS}" TEST_MODULES="-pl zeppelin-web" 
TEST_PROJECTS="-Pweb-e2e"
       addons:
         apt:
           packages:
@@ -73,7 +73,7 @@ matrix:
       dist: trusty
       addons:
         firefox: "31.0"
-      env: PYTHON="2" SCALA_VER="2.10" SPARK_VER="1.6.3" HADOOP_VER="2.6" 
PROFILE="-Pspark-1.6 -Phadoop2 -Phadoop-2.6 -Phelium-dev -Pexamples 
-Pintegration" BUILD_FLAG="install -DskipTests -DskipRat" TEST_FLAG="verify 
-DskipRat" TEST_PROJECTS="-pl .,zeppelin-integration -DfailIfNoTests=false"
+      env: CI="true" PYTHON="2" SCALA_VER="2.10" SPARK_VER="1.6.3" 
HADOOP_VER="2.6" PROFILE="-Pspark-1.6 -Phadoop2 -Phadoop-2.6 -Phelium-dev 
-Pexamples -Pintegration" BUILD_FLAG="install -DskipTests -DskipRat" 
TEST_FLAG="verify -DskipRat" TEST_PROJECTS="-pl .,zeppelin-integration 
-DfailIfNoTests=false"
 
     # Test interpreter modules
     - jdk: "openjdk7"

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f4a798b6/zeppelin-integration/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml
index eafa485..5240a2c 100644
--- a/zeppelin-integration/pom.xml
+++ b/zeppelin-integration/pom.xml
@@ -163,7 +163,7 @@
             <configuration>
               <target unless="skipTests">
                 <exec executable="./zeppelin-daemon.sh" 
dir="${zeppelin.daemon.package.base}"
-                  spawn="true">
+                  spawn="false">
                   <arg value="start"/>
                 </exec>
               </target>

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f4a798b6/zeppelin-web/package.json
----------------------------------------------------------------------
diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json
index 3ff642b..71c691b 100644
--- a/zeppelin-web/package.json
+++ b/zeppelin-web/package.json
@@ -19,7 +19,7 @@
     "dev:watch": "grunt watch-webpack-dev",
     "dev": "npm-run-all --parallel dev:server lint:watch dev:watch",
     "test:watch": "karma start karma.conf.js --single-run=false",
-    "pree2e": "webdriver-manager update --gecko false --versions.chrome=2.30",
+    "pree2e": "webdriver-manager update --gecko false --versions.chrome=2.35",
     "e2e": "protractor protractor.conf.js",
     "pretest": "npm rebuild phantomjs-prebuilt",
     "test": "karma start karma.conf.js"

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f4a798b6/zeppelin-web/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml
index 444f8b2..2a6c432 100644
--- a/zeppelin-web/pom.xml
+++ b/zeppelin-web/pom.xml
@@ -140,7 +140,7 @@
             <configuration>
               <skip>${web.e2e.disabled}</skip>
               <target unless="skipTests">
-                <exec executable="./zeppelin-daemon.sh" 
dir="${zeppelin.daemon.package.base}" spawn="true">
+                <exec executable="./zeppelin-daemon.sh" 
dir="${zeppelin.daemon.package.base}" spawn="false">
                   <arg value="start" />
                 </exec>
               </target>

Reply via email to