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/04/19 23:37:50 UTC
activemq-artemis git commit: ARTEMIS-482 fixing testsuite. Stopping
Executor at the proper place
Repository: activemq-artemis
Updated Branches:
refs/heads/master 31e4e7d32 -> 03b265099
ARTEMIS-482 fixing testsuite. Stopping Executor at the proper place
You have to stop the InVMExecutor after servers were stopped otherwise tests may hang
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/03b26509
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/03b26509
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/03b26509
Branch: refs/heads/master
Commit: 03b26509903ad51fb643717516b003675b05bce1
Parents: 31e4e7d
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Apr 19 17:34:31 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Apr 19 17:35:29 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/tests/util/ActiveMQTestBase.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03b26509/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 13868b2..fc4d957 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
@@ -230,14 +230,9 @@ public abstract class ActiveMQTestBase extends Assert {
@After
public void tearDown() throws Exception {
- for (ExecutorService s : executorSet) {
- s.shutdown();
- }
closeAllSessionFactories();
closeAllServerLocatorsFactories();
- InVMConnector.resetThreadPool();
-
try {
assertAllExecutorsFinished();
assertAllClientConsumersAreClosed();
@@ -275,6 +270,13 @@ public abstract class ActiveMQTestBase extends Assert {
finally {
cleanupPools();
}
+
+ for (ExecutorService s : executorSet) {
+ s.shutdown();
+ }
+ InVMConnector.resetThreadPool();
+
+
//clean up pools before failing
if (!exceptions.isEmpty()) {
for (Exception exception : exceptions) {