Repository: camel Updated Branches: refs/heads/master 7fe487c68 -> 7db9c8e5e
Make camel-itest-karaf to run all the tests as new version of surefire fails, so use older working version. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/332e31a6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/332e31a6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/332e31a6 Branch: refs/heads/master Commit: 332e31a62f68e0f5120af9519a0523524f78f58d Parents: 7fe487c Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Mar 12 11:20:51 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Mar 12 11:20:51 2016 +0100 ---------------------------------------------------------------------- tests/camel-itest-karaf/pom.xml | 9 ++++++++- .../org/apache/camel/itest/karaf/AbstractFeatureTest.java | 10 +++------- 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/332e31a6/tests/camel-itest-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml index 0fbb7a1..4bd0442 100644 --- a/tests/camel-itest-karaf/pom.xml +++ b/tests/camel-itest-karaf/pom.xml @@ -184,9 +184,13 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> + <!-- version 2.19.1 causes pax-exam to fail when testing the 2nd/3rd container when testing all --> + <!-- so we use an older version of surefire which works --> + <version>2.16</version> <configuration> <!-- do not re-run these tests --> - <rerunFailingTestsCount>0</rerunFailingTestsCount> + <!-- not supported by older version of surefire --> + <!--<rerunFailingTestsCount>0</rerunFailingTestsCount>--> <systemPropertyVariables> <karafVersion>${karaf-version}</karafVersion> </systemPropertyVariables> @@ -209,6 +213,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <!-- version 2.19.1 causes pax-exam to fail when testing the 2nd/3rd container when testing all --> + <!-- so we use an older version of surefire which works --> + <version>2.16</version> <configuration> <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> <!-- http://git-wip-us.apache.org/repos/asf/camel/blob/332e31a6/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java index 63f1688..2589c0d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java @@ -61,7 +61,6 @@ public abstract class AbstractFeatureTest { @Before public void setUp() throws Exception { LOG.info("setUp() using BundleContext: {}", bundleContext); - Thread.sleep(3000); } @After @@ -75,7 +74,7 @@ public abstract class AbstractFeatureTest { try { assertNotNull("Cannot get component with name: " + component, createCamelContext().getComponent(component)); return; - } catch (Exception t) { + } catch (Throwable t) { if (System.currentTimeMillis() < max) { Thread.sleep(1000); } else { @@ -97,7 +96,7 @@ public abstract class AbstractFeatureTest { assertNotNull(dataFormatDefinition); assertNotNull(dataFormatDefinition.getDataFormat(new DefaultRouteContext(createCamelContext()))); return; - } catch (Exception t) { + } catch (Throwable t) { if (System.currentTimeMillis() < max) { Thread.sleep(1000); } else { @@ -117,7 +116,7 @@ public abstract class AbstractFeatureTest { try { assertNotNull(createCamelContext().resolveLanguage(lang)); return; - } catch (Exception t) { + } catch (Throwable t) { if (System.currentTimeMillis() < max) { Thread.sleep(1000); } else { @@ -219,9 +218,6 @@ public abstract class AbstractFeatureTest { // we need INFO logging otherwise we cannot see what happens new LogLevelOption(LogLevelOption.LogLevel.INFO), - // to allow rbac to connect to localhost - org.ops4j.pax.exam.CoreOptions.systemProperty(Constants.RMI_HOST_PROPERTY).value("localhost"), - KarafDistributionOption.karafDistributionConfiguration() .frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject()) .karafVersion(karafVersion)
