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

This closes #570

This commit is contained in:
jbertram 2016-06-07 16:12:50 -05:00
parent 3d3a8fada0 fcaef51963
commit 4436f06f36
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
View File

@ -627,7 +627,7 @@ public abstract class ActiveMQTestBase extends Assert {
break; break;
} }
} }
} while (i++ <= 50 && hasValue); } while (i++ <= 200 && hasValue);
for (WeakReference<?> ref : references) { for (WeakReference<?> ref : references) {
Assert.assertNull(ref.get()); Assert.assertNull(ref.get());

9
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
View File

@ -410,8 +410,13 @@ public class FailoverTest extends FailoverTestBase {
session.rollback(xid); session.rollback(xid);
} }
catch (XAException e) { catch (XAException e) {
//there is still an edge condition that we must deal with try {
session.rollback(xid); //there is still an edge condition that we must deal with
session.rollback(xid);
}
catch (Exception ignored) {
log.trace(ignored.getMessage(), ignored);
}
} }
ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS); ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
View File

@ -16,13 +16,13 @@
*/ */
package org.apache.activemq.artemis.tests.integration.karaf; package org.apache.activemq.artemis.tests.integration.karaf;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.karaf.jaas.boot.principal.RolePrincipal; import org.apache.karaf.jaas.boot.principal.RolePrincipal;
import org.apache.karaf.jaas.boot.principal.UserPrincipal; import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.shell.api.console.Session; import org.apache.karaf.shell.api.console.Session;
import org.apache.karaf.shell.api.console.SessionFactory; import org.apache.karaf.shell.api.console.SessionFactory;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.qpid.jms.JmsConnectionFactory; import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.Assert;
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;
@ -66,7 +66,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
@RunWith(PaxExam.class) @RunWith(PaxExam.class)
public class ArtemisFeatureTest extends ActiveMQTestBase { public class ArtemisFeatureTest extends Assert {
private static Logger LOG = Logger.getLogger(ArtemisFeatureTest.class.getName()); private static Logger LOG = Logger.getLogger(ArtemisFeatureTest.class.getName());