Repository: camel Updated Branches: refs/heads/camel-2.14.x a2c682553 -> 5222fed62
camel-spark-rest: fixing timing issue in spark tests. -DskipTests really skips the tests now (cherry picked from commit 47d169ae7d1c6b5cc2192b9603b2c4f47140df48) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5222fed6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5222fed6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5222fed6 Branch: refs/heads/camel-2.14.x Commit: 5222fed62c631cc1063fb99d24c12eb7f520038a Parents: a2c6825 Author: Grzegorz Grzybek <[email protected]> Authored: Fri Sep 12 09:26:31 2014 +0200 Committer: Grzegorz Grzybek <[email protected]> Committed: Fri Sep 12 10:21:01 2014 +0200 ---------------------------------------------------------------------- components/camel-spark-rest/pom.xml | 16 ++-------------- .../camel/component/sparkrest/BaseSparkTest.java | 1 + 2 files changed, 3 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5222fed6/components/camel-spark-rest/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spark-rest/pom.xml b/components/camel-spark-rest/pom.xml index e54ef26..fe466a0 100644 --- a/components/camel-spark-rest/pom.xml +++ b/components/camel-spark-rest/pom.xml @@ -119,15 +119,14 @@ <profile> <id>jdk8-test</id> <activation> - <jdk>1.8</jdk> + <jdk>!1.8</jdk> </activation> <build> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <skipTests>false</skipTests> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> + <skipTests>true</skipTests> </configuration> </plugin> </plugins> @@ -135,15 +134,4 @@ </profile> </profiles> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/camel/blob/5222fed6/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/BaseSparkTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/BaseSparkTest.java b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/BaseSparkTest.java index 77d862e..a810ace 100644 --- a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/BaseSparkTest.java +++ b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/BaseSparkTest.java @@ -32,6 +32,7 @@ public abstract class BaseSparkTest extends CamelTestSupport { public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(25500); super.setUp(); + Thread.sleep(200); } @Override
