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 2017/07/24 13:51:18 UTC

[3/3] activemq-artemis git commit: ARTEMIS-1276 avoid System.exit in tests as Surefire cannot deal with that

ARTEMIS-1276 avoid System.exit in tests as Surefire cannot deal with that

This change results in many more tests being run. Previously, 662 tests
were executed. Now, 1166 tests is executed. The running time has increased
from ~20 minutes to ~50 minutes.


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

Branch: refs/heads/master
Commit: 7e9c3fdfb7a6978d174aec5949e4b18b6789c56a
Parents: 9647c19
Author: Jiri Danek <jd...@redhat.com>
Authored: Mon Jul 17 11:51:55 2017 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jul 24 09:50:40 2017 -0400

----------------------------------------------------------------------
 tests/activemq5-unit-tests/pom.xml                                | 3 +++
 .../src/test/java/org/apache/activemq/AutoFailTestSupport.java    | 1 +
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7e9c3fdf/tests/activemq5-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index 309efcb..cd58170 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -435,6 +435,9 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
                <skipTests>${skipActiveMQ5Tests}</skipTests>
+               <systemPropertyVariables>
+                  <org.apache.activemq.AutoFailTestSupport.disableSystemExit>true</org.apache.activemq.AutoFailTestSupport.disableSystemExit>
+               </systemPropertyVariables>
 <!--
                <additionalClasspathElements>
                   <additionalClasspathElement>src/main/resources/stomp</additionalClasspathElement>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7e9c3fdf/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/AutoFailTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/AutoFailTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/AutoFailTestSupport.java
index fe58442..06a2f79 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/AutoFailTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/AutoFailTestSupport.java
@@ -89,6 +89,7 @@ public abstract class AutoFailTestSupport extends TestCase {
                      System.exit(EXIT_ERROR);
                   } else {
                      LOG.error("No system.exit as it kills surefire - forkedProcessTimeoutInSeconds (surefire.timeout) will kick in eventually see pom.xml surefire plugin config");
+                     fail("Timeout in AutoFailTestSupport class has been exceeded");
                   }
                }
             }