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 2016/03/18 15:11:52 UTC

[1/2] activemq-artemis git commit: ARTEMIS-442 - [Artemis Testsuite] ConcurrentDeliveryCancelTest#testConcurrentCancels calls System.exit

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 57c1c338e -> 923c12c7a


ARTEMIS-442 - [Artemis Testsuite] ConcurrentDeliveryCancelTest#testConcurrentCancels calls System.exit


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

Branch: refs/heads/master
Commit: edadc79c5f008d8d3a530b45bf109a127c389e5b
Parents: 57c1c33
Author: Erich Duda <ed...@redhat.com>
Authored: Fri Mar 18 09:35:40 2016 +0100
Committer: Erich Duda <ed...@redhat.com>
Committed: Fri Mar 18 09:35:40 2016 +0100

----------------------------------------------------------------------
 .../tests/extras/byteman/ConcurrentDeliveryCancelTest.java    | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/edadc79c/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
index f33685c..15cfc19 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
@@ -246,12 +246,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase {
             }
          }
 
-         if (failed) {
-            System.err.println("Failed");
-            System.exit(-1);
-         }
-
-         Assert.assertFalse("test failed, look at the system.out of the test for more infomration", failed);
+         Assert.assertFalse("test failed, look at the system.out of the test for more information", failed);
       }
       finally {
          connection.close();


[2/2] activemq-artemis git commit: This closes #424

Posted by cl...@apache.org.
This closes #424


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

Branch: refs/heads/master
Commit: 923c12c7a4595cfbd9193742f6d5ae99b434475d
Parents: 57c1c33 edadc79
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Mar 18 10:11:37 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Mar 18 10:11:37 2016 -0400

----------------------------------------------------------------------
 .../tests/extras/byteman/ConcurrentDeliveryCancelTest.java    | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------