Repository: activemq Updated Branches: refs/heads/trunk c93b6614b -> 7ce5be44d
wait for bundle installation to complete - makes obr test more robust Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/7ce5be44 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/7ce5be44 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/7ce5be44 Branch: refs/heads/trunk Commit: 7ce5be44d8a39e87088c7d648244aaadec63fd44 Parents: c93b661 Author: gtully <[email protected]> Authored: Wed Jan 21 22:17:00 2015 +0000 Committer: gtully <[email protected]> Committed: Wed Jan 21 22:17:35 2015 +0000 ---------------------------------------------------------------------- .../org/apache/activemq/karaf/itest/ObrFeatureTest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/7ce5be44/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 26fb9fb..93306be 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 @@ -39,7 +39,7 @@ public class ObrFeatureTest extends AbstractFeatureTest { Option[] options = append( editConfigurationFilePut("etc/system.properties", "camel.version", MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel")), configure("obr")); - // can't see where these deps die in a pax-web container - vanilla distro unpack can install war feature ok + // can't see where these deps die in a paxexam container - vanilla distro unpack can install war feature ok options = append(CoreOptions.mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(), options); options = append(CoreOptions.mavenBundle("org.apache.xbean", "xbean-asm-util").versionAsInProject(), options); return append(CoreOptions.mavenBundle("org.apache.xbean", "xbean-finder").versionAsInProject(), options); @@ -49,6 +49,13 @@ 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"); }
