Repository: activemq Updated Branches: refs/heads/master 97b0619b2 -> f0cb95c79
fix amqp karaf test and re-enable tests in CI Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f0cb95c7 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f0cb95c7 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f0cb95c7 Branch: refs/heads/master Commit: f0cb95c79252f6f2ae37ee578ef7fa85ae878fa1 Parents: 97b0619 Author: Dejan Bosanac <[email protected]> Authored: Wed Jun 24 14:20:10 2015 +0200 Committer: Dejan Bosanac <[email protected]> Committed: Wed Jun 24 14:20:10 2015 +0200 ---------------------------------------------------------------------- activemq-karaf-itest/pom.xml | 3 --- .../karaf/itest/ActiveMQAMQPBrokerFeatureTest.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/f0cb95c7/activemq-karaf-itest/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index b6a0378..8d6fea6 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -236,9 +236,6 @@ on this information to PAX mvn url --> <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine> - <excludes> - <exclude>**/*Test.*</exclude> - </excludes> <systemPropertyVariables> <activemqVersion>${project.version}</activemqVersion> <karafVersion>${karaf-version}</karafVersion> http://git-wip-us.apache.org/repos/asf/activemq/blob/f0cb95c7/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java index f9ecba0..59ce4db 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java @@ -27,6 +27,10 @@ import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; +import java.util.concurrent.Callable; + +import static org.junit.Assert.assertTrue; + @RunWith(PaxExam.class) public class ActiveMQAMQPBrokerFeatureTest extends ActiveMQBrokerFeatureTest { private static final Integer AMQP_PORT = 61636; @@ -49,6 +53,15 @@ public class ActiveMQAMQPBrokerFeatureTest extends ActiveMQBrokerFeatureTest { @Override 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; JmsConnectionFactory factory = new JmsConnectionFactory(amqpURI);
