Repository: activemq Updated Branches: refs/heads/master f58683ea0 -> b17cc37ef
Fixing intermitent Karaf itest failure Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b17cc37e Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b17cc37e Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b17cc37e Branch: refs/heads/master Commit: b17cc37ef934404e6383d10c966c43fc20e48215 Parents: f58683e Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Wed Sep 9 14:27:40 2015 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Wed Sep 9 14:28:09 2015 +0000 ---------------------------------------------------------------------- .../activemq/karaf/itest/ObrFeatureTest.java | 25 ++------------------ 1 file changed, 2 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/b17cc37e/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java index 9160e3b..c59b2df 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java @@ -16,7 +16,8 @@ */ package org.apache.activemq.karaf.itest; -import java.util.concurrent.Callable; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; + import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -24,11 +25,6 @@ import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.MavenUtils; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.options.MavenArtifactProvisionOption; - - -import static org.junit.Assert.assertTrue; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; @RunWith(PaxExam.class) @@ -48,14 +44,6 @@ public class ObrFeatureTest extends AbstractFeatureTest { @Test(timeout=5 * 60 * 1000) public void testWar() throws Throwable { - // note xbean deps manually installed above, should not be needed - withinReason(new Callable<Boolean>() { - @Override - public Boolean call() throws Exception { - assertTrue("xbean finder bundle installed", verifyBundleInstalled("org.apache.xbean.finder")); - return true; - } - }); installAndAssertFeature("war"); } @@ -71,15 +59,6 @@ public class ObrFeatureTest extends AbstractFeatureTest { @Test(timeout=5 * 60 * 1000) public void testBroker() throws Throwable { - // ensure pax-war feature deps are there for web-console - withinReason(new Callable<Boolean>() { - @Override - public Boolean call() throws Exception { - assertTrue("xbean finder bundle installed", verifyBundleInstalled("org.apache.xbean.finder")); - return true; - } - }); - installAndAssertFeature("activemq-broker"); }