Merge pull request #11079 from MishaDemianenko/3.4-wait-for-all

Wait for all indexes before running tests in NodeValueIndex*Tests
neo4j · Feb 21, 2018 · 480a9e7 · 480a9e7
2 parents 278e60c + 066b0d0
commit 480a9e7
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.../kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeValueIndexCursorTestBase.java b/.../kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeValueIndexCursorTestBase.java
@@ -26,7 +26,6 @@
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Transaction;
-import org.neo4j.graphdb.schema.IndexDefinition;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
@@ -52,10 +51,9 @@ public abstract class NodeValueIndexCursorTestBase<G extends KernelAPIReadTestSu
     @Override
     void createTestGraph( GraphDatabaseService graphDb )
     {
-        IndexDefinition index;
         try ( Transaction tx = graphDb.beginTx() )
         {
-            index = graphDb.schema().indexFor( label( "Node" ) ).on( "prop" ).create();
+            graphDb.schema().indexFor( label( "Node" ) ).on( "prop" ).create();
             tx.success();
         }
         try ( Transaction tx = graphDb.beginTx() )
@@ -69,7 +67,7 @@ void createTestGraph( GraphDatabaseService graphDb )
         }
         try ( Transaction tx = graphDb.beginTx() )
         {
-            graphDb.schema().awaitIndexOnline( index, 60, SECONDS );
+            graphDb.schema().awaitIndexesOnline( 60, SECONDS );
             tx.success();
         }
         try ( Transaction tx = graphDb.beginTx() )