From 7e9c3fdfb7a6978d174aec5949e4b18b6789c56a Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Mon, 17 Jul 2017 11:51:55 +0200
Subject: [PATCH] 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.
---
 tests/activemq5-unit-tests/pom.xml                             | 3 +++
 .../src/test/java/org/apache/activemq/AutoFailTestSupport.java | 1 +
 2 files changed, 4 insertions(+)

diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index 309efcb3fc..cd58170b56 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>
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 fe58442e38..06a2f79145 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");
                   }
                }
             }