Merge pull request #6068 from lutovich/3.0-flaky-TestApps-canTerminat…

…eAnActiveCommand Fix flaky TestApps#canTerminateAnActiveCommand()
neo4j · Dec 11, 2015 · b067336 · b067336
2 parents a698cdf + bfda5c9
commit b067336
Showing 1 changed file with 23 additions and 16 deletions.
diff --git a/community/shell/src/test/java/org/neo4j/shell/TestApps.java b/community/shell/src/test/java/org/neo4j/shell/TestApps.java
@@ -26,6 +26,8 @@
 import java.io.PrintWriter;
 import java.io.Serializable;
 import java.util.Map;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Future;
 import java.util.regex.Pattern;
 
 import org.neo4j.cypher.NodeStillHasRelationshipsException;
@@ -38,6 +40,7 @@
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.schema.IndexDefinition;
 import org.neo4j.graphdb.schema.Schema.IndexState;
+import org.neo4j.kernel.impl.transaction.TransactionStats;
 import org.neo4j.shell.impl.CollectingOutput;
 import org.neo4j.shell.impl.SameJvmClient;
 import org.neo4j.shell.kernel.GraphDatabaseShellServer;
@@ -46,17 +49,18 @@
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.neo4j.graphdb.Direction.OUTGOING;
 import static org.neo4j.graphdb.Label.label;
-import static org.neo4j.graphdb.RelationshipType.withName;
 import static org.neo4j.graphdb.Neo4jMatchers.findNodesByLabelAndProperty;
 import static org.neo4j.graphdb.Neo4jMatchers.hasLabels;
 import static org.neo4j.graphdb.Neo4jMatchers.hasProperty;
 import static org.neo4j.graphdb.Neo4jMatchers.hasSize;
 import static org.neo4j.graphdb.Neo4jMatchers.inTx;
 import static org.neo4j.graphdb.Neo4jMatchers.waitForIndex;
+import static org.neo4j.graphdb.RelationshipType.withName;
 import static org.neo4j.helpers.collection.MapUtil.genericMap;
 
 public class TestApps extends AbstractShellTest
@@ -1193,27 +1197,30 @@ public void canListAllConfiguration() throws Exception
     @Test
     public void canTerminateAnActiveCommand() throws Exception
     {
-        final ShellServer server = this.shellServer;
-        final Serializable clientId = this.shellClient.getId();
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run()
+        TransactionStats txStats = db.getDependencyResolver().resolveDependency( TransactionStats.class );
+        assertEquals( 0, txStats.getNumberOfActiveTransactions() );
+
+        Serializable clientId = shellClient.getId();
+        Future<?> result = ForkJoinPool.commonPool().submit( () -> {
+            try
             {
-                try
-                {
-                    Thread.sleep(1);
-                    server.terminate( clientId );
-                }
-                catch ( Exception e )
+                while ( txStats.getNumberOfActiveTransactions() == 0 )
                 {
-                    throw new RuntimeException( e );
+                    Thread.sleep( 10 );
                 }
+                assertEquals( 1, txStats.getNumberOfActiveTransactions() );
+
+                shellServer.terminate( clientId );
+            }
+            catch ( Exception e )
+            {
+                throw new RuntimeException( e );
             }
-        });
-        thread.start();
+        } );
 
-        executeCommandExpectingException( "FOREACH(i IN range(0, 10000) | CREATE ());",
+        executeCommandExpectingException( "FOREACH(i IN range(0, " + Integer.MAX_VALUE + ") | CREATE ());",
                 "has been terminated" );
+        assertNull( result.get() );
     }
 
     @Test