From 3931d6d8314d24bb8d738a32d7f14dd75e3ae898 Mon Sep 17 00:00:00 2001
From: Longda Feng <zhongyan.feng@alibaba-inc.com>
Date: Wed, 9 Mar 2016 00:33:02 +0800
Subject: [PATCH] fix run multiple integrate test

---
 jstorm-core/pom.xml                                            | 2 ++
 jstorm-core/src/main/java/backtype/storm/LocalCluster.java     | 2 ++
 .../com/alibaba/jstorm/topology/TransactionalWordsTest.java    | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/jstorm-core/pom.xml b/jstorm-core/pom.xml
index 5ce9994a9..833b7871d 100644
--- a/jstorm-core/pom.xml
+++ b/jstorm-core/pom.xml
@@ -26,6 +26,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <!--<forkCount>1</forkCount>-->
+                    <forkMode>pertest</forkMode>
                     <argLine>-Xms1024m -Xmx4096m</argLine>
                 </configuration>
             </plugin>
diff --git a/jstorm-core/src/main/java/backtype/storm/LocalCluster.java b/jstorm-core/src/main/java/backtype/storm/LocalCluster.java
index 70d386a3e..f20219ace 100644
--- a/jstorm-core/src/main/java/backtype/storm/LocalCluster.java
+++ b/jstorm-core/src/main/java/backtype/storm/LocalCluster.java
@@ -175,6 +175,8 @@ public void shutdown() {
         JStormUtils.sleepMs(10 * 1000);
         this.state.clean();
         instance = null;
+        //wait 10 second to exit to make run multiple junit test
+        JStormUtils.sleepMs(10 * 1000);
     }
 
     @Override
diff --git a/jstorm-core/src/test/java/com/alibaba/jstorm/topology/TransactionalWordsTest.java b/jstorm-core/src/test/java/com/alibaba/jstorm/topology/TransactionalWordsTest.java
index c709b1b58..5bdf2a203 100644
--- a/jstorm-core/src/test/java/com/alibaba/jstorm/topology/TransactionalWordsTest.java
+++ b/jstorm-core/src/test/java/com/alibaba/jstorm/topology/TransactionalWordsTest.java
@@ -277,13 +277,14 @@ public void test_transaction_word() {
 
             cluster.submitTopology("top-n-topology", config, builder.buildTopology());
 
-            JStormUtils.sleepMs(100 * 1000);
+            JStormUtils.sleepMs(60 * 1000);
             
             
             assertEquals(false, outOfOrder.get() );
             assertNotSame(0, receiveCounter1.get());
             assertNotSame(0, receiveCounter2.get());
             
+            cluster.killTopology("top-n-topology");
             cluster.shutdown();
         } catch (Exception e) {
             Assert.fail("Failed to run simple transaction");