You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/06/07 21:13:43 UTC
[1/4] activemq-artemis git commit: test fix
Repository: activemq-artemis
Updated Branches:
refs/heads/master 3d3a8fada -> 4436f06f3
test fix
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fcaef519
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fcaef519
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fcaef519
Branch: refs/heads/master
Commit: fcaef51963f6d7363f9ed7f45d3236c060e5ce55
Parents: f0f431a
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jun 7 16:24:34 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jun 7 17:03:41 2016 -0400
----------------------------------------------------------------------
.../tests/integration/cluster/failover/FailoverTest.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fcaef519/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
index 229136a..ea9cb8e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
@@ -410,8 +410,13 @@ public class FailoverTest extends FailoverTestBase {
session.rollback(xid);
}
catch (XAException e) {
- //there is still an edge condition that we must deal with
- session.rollback(xid);
+ try {
+ //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);
[2/4] activemq-artemis git commit: Adding more time on
checkWeakReferences
Posted by jb...@apache.org.
Adding more time on checkWeakReferences
This will fix a few intermittent failures
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f0f431ac
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f0f431ac
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f0f431ac
Branch: refs/heads/master
Commit: f0f431aceabe9f228fb50968ae1969287e5fff8e
Parents: 065f994
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jun 7 16:10:06 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jun 7 17:03:41 2016 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f0f431ac/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index 064091d..3e4d4c0 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -627,7 +627,7 @@ public abstract class ActiveMQTestBase extends Assert {
break;
}
}
- } while (i++ <= 50 && hasValue);
+ } while (i++ <= 200 && hasValue);
for (WeakReference<?> ref : references) {
Assert.assertNull(ref.get());
[4/4] activemq-artemis git commit: This closes #570
Posted by jb...@apache.org.
This closes #570
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4436f06f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4436f06f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4436f06f
Branch: refs/heads/master
Commit: 4436f06f3695d01a124b600bdf8fa705f024c6dd
Parents: 3d3a8fa fcaef51
Author: jbertram <jb...@apache.org>
Authored: Tue Jun 7 16:12:50 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Tue Jun 7 16:12:50 2016 -0500
----------------------------------------------------------------------
.../activemq/artemis/tests/util/ActiveMQTestBase.java | 2 +-
.../tests/integration/cluster/failover/FailoverTest.java | 9 +++++++--
.../artemis/tests/integration/karaf/ArtemisFeatureTest.java | 4 ++--
3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[3/4] activemq-artemis git commit: Fixing test faliure
Posted by jb...@apache.org.
Fixing test faliure
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/065f9945
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/065f9945
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/065f9945
Branch: refs/heads/master
Commit: 065f9945eb0f86cdb6e6c1d87e997acb0bb64e97
Parents: 3d3a8fa
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jun 7 12:51:23 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jun 7 17:03:41 2016 -0400
----------------------------------------------------------------------
.../artemis/tests/integration/karaf/ArtemisFeatureTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/065f9945/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
index 75a12a8..134dd9a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
@@ -16,13 +16,13 @@
*/
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.UserPrincipal;
import org.apache.karaf.shell.api.console.Session;
import org.apache.karaf.shell.api.console.SessionFactory;
import org.apache.log4j.Logger;
import org.apache.qpid.jms.JmsConnectionFactory;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
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;
@RunWith(PaxExam.class)
-public class ArtemisFeatureTest extends ActiveMQTestBase {
+public class ArtemisFeatureTest extends Assert {
private static Logger LOG = Logger.getLogger(ArtemisFeatureTest.class.getName());