Repository: incubator-zeppelin Updated Branches: refs/heads/master 754c55ec4 -> 4f3c84049
ZEPPELIN-76 skip Selenium tests on 'mvn package' Selenium-based tests are now triggerd by scalatest, instead of maven-failsafe-plugin, that is why they were triggered on `mvn package`. This PR moves scalatest invocation further down the chain, i.e now only `mvn verify` or `mvn install` will trigger them. No more `-DskipTests` by default! Author: Alexander Bezzubov <[email protected]> Closes #280 from bzz/ZEPPELIN-76-add-skip-selenium-tests-on-package and squashes the following commits: 3b8d65a [Alexander Bezzubov] ZEPPELIN-76: moving Selenium-based IT to integration-test phase (mvn verify) a31b3d9 [Alexander Bezzubov] ZEPPELIN-76: style fixes in Server, typo+format Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/4f3c8404 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/4f3c8404 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/4f3c8404 Branch: refs/heads/master Commit: 4f3c8404947c7df889c6e20dde2fbb893baaaaaf Parents: 754c55e Author: Alexander Bezzubov <[email protected]> Authored: Fri Sep 4 14:57:15 2015 +0900 Committer: Alexander Bezzubov <[email protected]> Committed: Sat Sep 5 07:16:57 2015 +0900 ---------------------------------------------------------------------- zeppelin-server/pom.xml | 15 ++++++++------- .../apache/zeppelin/AbstractFunctionalSuite.scala | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/4f3c8404/zeppelin-server/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 9f908fe..03f0ad0 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -357,7 +357,7 @@ </execution> </executions> <configuration> - <argLine>-Xmx2048m</argLine> + <argLine>-Xmx2048m</argLine> </configuration> </plugin> @@ -396,6 +396,7 @@ <executions> <execution> <id>test</id> + <phase>integration-test</phase> <goals> <goal>test</goal> </goals> @@ -448,9 +449,9 @@ <activeByDefault>true</activeByDefault> </activation> <properties> - <zeppelin.daemon.package.base> - ../bin - </zeppelin.daemon.package.base> + <zeppelin.daemon.package.base> + ../bin + </zeppelin.daemon.package.base> </properties> </profile> @@ -460,9 +461,9 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <zeppelin.daemon.package.base> - ../zeppelin-distribution/target/zeppelin-${project.version}/zeppelin-${project.version}/bin - </zeppelin.daemon.package.base> + <zeppelin.daemon.package.base> + ../zeppelin-distribution/target/zeppelin-${project.version}/zeppelin-${project.version}/bin + </zeppelin.daemon.package.base> </properties> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/4f3c8404/zeppelin-server/src/test/scala/org/apache/zeppelin/AbstractFunctionalSuite.scala ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/scala/org/apache/zeppelin/AbstractFunctionalSuite.scala b/zeppelin-server/src/test/scala/org/apache/zeppelin/AbstractFunctionalSuite.scala index a83ab5b..93899e4 100644 --- a/zeppelin-server/src/test/scala/org/apache/zeppelin/AbstractFunctionalSuite.scala +++ b/zeppelin-server/src/test/scala/org/apache/zeppelin/AbstractFunctionalSuite.scala @@ -55,7 +55,7 @@ class AbstractFunctionalSuite extends FunSuite with WebBrowser with BeforeAndAft } def getDriver(): WebDriver = { - val possibleDrivers = List[() => WebDriver](safary, chrome, firefox) + val possibleDrivers = List[() => WebDriver](safari, chrome, firefox) val createdDriver = possibleDrivers.map(driverFactory => Try(driverFactory.apply())).find(_.isSuccess) createdDriver match { case Some(driver) => driver.get @@ -63,7 +63,7 @@ class AbstractFunctionalSuite extends FunSuite with WebBrowser with BeforeAndAft } } - def safary(): WebDriver = { + def safari(): WebDriver = { new SafariDriver() }
