address review

AviAvni · AviAvni · commit f5ed546540a8 · 2021-10-18T10:42:13.000+03:00
diff --git a/tests/flow/test_index_create.py b/tests/flow/test_index_create.py
@@ -80,7 +80,7 @@ def test02_fulltext_index_creation_label_config(self):
             self.env.assertIn("Index already exists configuration can't be changed", str(e))
 
         try:
-            # create an index over L1:v4 with stopwords should failed
+            # create an index over L1:v4 with language should failed
             result = redis_graph.query("CALL db.idx.fulltext.createNodeIndex({ label: 'L1', language: 'english' }, 'v4')")
             assert(False)
         except ResponseError as e:
@@ -90,7 +90,7 @@ def test02_fulltext_index_creation_label_config(self):
         result = redis_graph.query("CALL db.idx.fulltext.drop('L1')")
         self.env.assertEquals(result.indices_deleted, 1)
 
-        # create an index over L1:v4 with stopwords
+        # create an index over L1:v4 with language
         result = redis_graph.query("CALL db.idx.fulltext.createNodeIndex({ label: 'L1', language: 'english' }, 'v4')")
         self.env.assertEquals(result.indices_created, 1)
 
@@ -102,7 +102,7 @@ def test02_fulltext_index_creation_label_config(self):
             self.env.assertIn("Stopwords must be array", str(e))
 
         try:
-            # create an index over L3:v1 with stopwords should failed
+            # create an index over L3:v1 with language should failed
             result = redis_graph.query("CALL db.idx.fulltext.createNodeIndex({ label: 'L3', language: ['english'] }, 'v1')")
             assert(False)
         except ResponseError as e:
@@ -118,6 +118,10 @@ def test03_multi_prop_index_creation(self):
         result = redis_graph.query("CREATE INDEX ON :person(age, name)")
         self.env.assertEquals(result.indices_created, 0)
 
+        # try to create an index over person:name and person:age, index shouldn't be created as it already exist
+        result = redis_graph.query("CREATE INDEX ON :person(name, age)")
+        self.env.assertEquals(result.indices_created, 0)
+
         # try to create an index over person:age and person:name and person:height, index for height should be created as the rest already exist
         result = redis_graph.query("CREATE INDEX ON :person(age, age, name, height)")
         self.env.assertEquals(result.indices_created, 1)
diff --git a/tests/flow/test_persistency.py b/tests/flow/test_persistency.py
@@ -142,7 +142,7 @@ def test02_deleted_entity_migration(self):
             first_result = graph.query(query)
 
             # Save RDB & Load from RDB
-            redis_con.execute_command("DEBUG", "RELOAD")
+            self.env.dumpAndReload()
 
             second_result = graph.query(query)
             self.env.assertEquals(first_result.result_set,
@@ -162,7 +162,7 @@ def test03_restore_properties(self):
             self.env.assertEquals(result.properties_set, 5)
 
             # Save RDB & Load from RDB
-            redis_con.execute_command("DEBUG", "RELOAD")
+            self.env.dumpAndReload()
 
             query = """MATCH (p) RETURN p.boolval, p.numval, p.strval, p.array, p.pointval"""
             actual_result = graph.query(query)
@@ -198,7 +198,7 @@ def test04_repeated_edges(self):
             self.env.assertEquals(actual_result.result_set, expected_result)
 
             # Save RDB & Load from RDB
-            redis_con.execute_command("DEBUG", "RELOAD")
+            self.env.dumpAndReload()
 
             # Verify that the latest edge was properly saved and loaded
             actual_result = graph.query(q)
@@ -214,7 +214,8 @@ def test05_load_large_graph(self):
         self.env.assertEquals(actual_result.nodes_created, 100_000)
         self.env.assertEquals(actual_result.relationships_created, 50_000)
 
-        redis_con.execute_command("DEBUG", "RELOAD")
+        # Save RDB & Load from RDB
+        self.env.dumpAndReload()
 
         expected_result = [[50000]]
 
@@ -244,7 +245,7 @@ def test06_persist_multiple_labels(self):
         self.env.assertEquals(actual_result.result_set, expected_result)
 
         # Save RDB & Load from RDB
-        redis_con.execute_command("DEBUG", "RELOAD")
+        self.env.dumpAndReload()
 
         # Verify that the graph was properly saved and loaded
         actual_result = g.query(q)
