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

fix amqp karaf test and re-enable tests in CI

This commit is contained in:
Dejan Bosanac 2015-06-24 14:20:10 +02:00
parent 97b0619b26
commit f0cb95c792
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-karaf-itest/pom.xml
View File

@ -236,9 +236,6 @@
on this information to PAX mvn url on this information to PAX mvn url
--> -->
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine> <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
<excludes>
<exclude>**/*Test.*</exclude>
</excludes>
<systemPropertyVariables> <systemPropertyVariables>
<activemqVersion>${project.version}</activemqVersion> <activemqVersion>${project.version}</activemqVersion>
<karafVersion>${karaf-version}</karafVersion> <karafVersion>${karaf-version}</karafVersion>

13
activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
View File

@ -27,6 +27,10 @@ import org.ops4j.pax.exam.CoreOptions;
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 java.util.concurrent.Callable;
import static org.junit.Assert.assertTrue;
@RunWith(PaxExam.class) @RunWith(PaxExam.class)
public class ActiveMQAMQPBrokerFeatureTest extends ActiveMQBrokerFeatureTest { public class ActiveMQAMQPBrokerFeatureTest extends ActiveMQBrokerFeatureTest {
private static final Integer AMQP_PORT = 61636; private static final Integer AMQP_PORT = 61636;
@ -49,6 +53,15 @@ public class ActiveMQAMQPBrokerFeatureTest extends ActiveMQBrokerFeatureTest {
@Override @Override
protected Connection getConnection() throws Throwable { protected Connection getConnection() throws Throwable {
withinReason(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
assertTrue("qpid jms client bundle installed", verifyBundleInstalled("qpid-jms-client"));
return true;
}
});
String amqpURI = "amqp://localhost:" + AMQP_PORT; String amqpURI = "amqp://localhost:" + AMQP_PORT;
JmsConnectionFactory factory = new JmsConnectionFactory(amqpURI); JmsConnectionFactory factory = new JmsConnectionFactory(amqpURI);