Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing intermitent Karaf itest failure

This commit is contained in:
Christopher L. Shannon (cshannon) 2015-09-09 14:27:40 +00:00
parent f58683ea07
commit b17cc37ef9
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
View File

@ -16,7 +16,8 @@
*/ */
package org.apache.activemq.karaf.itest; 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.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration; 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.MavenUtils;
import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam; 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) @RunWith(PaxExam.class)
@ -48,14 +44,6 @@ public class ObrFeatureTest extends AbstractFeatureTest {
@Test(timeout=5 * 60 * 1000) @Test(timeout=5 * 60 * 1000)
public void testWar() throws Throwable { 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"); installAndAssertFeature("war");
} }
@ -71,15 +59,6 @@ public class ObrFeatureTest extends AbstractFeatureTest {
@Test(timeout=5 * 60 * 1000) @Test(timeout=5 * 60 * 1000)
public void testBroker() throws Throwable { 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"); installAndAssertFeature("activemq-broker");
} }