You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/02/19 22:40:59 UTC

[1/2] activemq-artemis git commit: ARTEMIS-1680 Fixing intermittent failure

Repository: activemq-artemis
Updated Branches:
  refs/heads/master cfb38589d -> 24b546f84


ARTEMIS-1680 Fixing intermittent failure

This will make sure the cluster is well formed before doing assertions


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/132af015
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/132af015
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/132af015

Branch: refs/heads/master
Commit: 132af0159526e38981d452846d470829f89ae8a4
Parents: cfb3858
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Feb 19 17:16:24 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Feb 19 17:16:27 2018 -0500

----------------------------------------------------------------------
 .../tests/integration/mqtt/imported/MqttClusterWildcardTest.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/132af015/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
index 105e7d7..b9185b2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
@@ -169,6 +169,8 @@ public class MqttClusterWildcardTest extends ClusterTestBase {
 
          waitForBindings(1, TOPIC, 1, 1, false);
          waitForBindings(1, TOPIC, 1, 1, true);
+         waitForBindings(0, TOPIC, 1, 1, true);
+
 
          connection1.publish("test/1/some/la", payload1.getBytes(), QoS.AT_LEAST_ONCE, false);
          connection1.publish("test/1/some/la", payload2.getBytes(), QoS.AT_MOST_ONCE, false);

[2/2] activemq-artemis git commit: NO-JIRA changing accept port

Posted by cl...@apache.org.
NO-JIRA changing accept port

This will clash if you have jenkins running on a default 8080 port.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/24b546f8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/24b546f8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/24b546f8

Branch: refs/heads/master
Commit: 24b546f84e6787aa2152b76e5689195c61ef518e
Parents: 132af01
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Feb 19 17:36:30 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Feb 19 17:36:34 2018 -0500

----------------------------------------------------------------------
 .../transports/netty/NettyConnectorWithHTTPUpgradeTest.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24b546f8/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
index d0f98db..b93dc44 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
@@ -91,7 +91,7 @@ public class NettyConnectorWithHTTPUpgradeTest extends ActiveMQTestBase {
 
    private static final SimpleString QUEUE = new SimpleString("NettyConnectorWithHTTPUpgradeTest");
 
-   private static final int HTTP_PORT = 8080;
+   private static final int HTTP_PORT = 8789;
 
    private Configuration conf;
    private ActiveMQServer server;