From 8fd79f6da95970dcbd607c0a3e09157c7860b347 Mon Sep 17 00:00:00 2001
From: xtcyclist <7731943+xtcyclist@users.noreply.github.com>
Date: Sat, 3 Sep 2022 10:33:07 +0800
Subject: [PATCH] Added retries to query executions in some tck cases.

---
 tests/tck/conftest.py                                     | 1 -
 tests/tck/features/delete/DeleteVertexWithoutEdge.feature | 4 ++--
 tests/tck/features/insert/Insert.feature                  | 2 +-
 tests/tck/features/insert/insertVertexOnly.feature        | 2 +-
 tests/tck/features/lookup/LookupTag2.feature              | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/tck/conftest.py b/tests/tck/conftest.py
index 0c0e3b276ef..140064f7cc0 100644
--- a/tests/tck/conftest.py
+++ b/tests/tck/conftest.py
@@ -412,7 +412,6 @@ def executing_query_with_retry(query, exec_ctx, request, secs, retryTimes):
     res = exec_ctx["result_set"]
     if not res.is_succeeded():
       retryCounter = 0
-      pdb.set_trace()
       while retryCounter < retryTimes:
         time.sleep(secs)
         exec_query(request, ngql, exec_ctx)
diff --git a/tests/tck/features/delete/DeleteVertexWithoutEdge.feature b/tests/tck/features/delete/DeleteVertexWithoutEdge.feature
index cdc7bb3d6ab..bbdf792aa3f 100644
--- a/tests/tck/features/delete/DeleteVertexWithoutEdge.feature
+++ b/tests/tck/features/delete/DeleteVertexWithoutEdge.feature
@@ -17,7 +17,7 @@ Feature: delete vertex without edge
       CREATE EDGE e();
       """
     And wait 6 seconds
-    When executing query:
+    When executing query and retrying it on failure every 6 seconds for 3 times:
       """
       INSERT VERTEX t(id) VALUES 1:(1),2:(2),3:(3);
       INSERT EDGE e() VALUES 1->2:(),1->3:();
@@ -74,7 +74,7 @@ Feature: delete vertex without edge
       CREATE EDGE e();
       """
     And wait 6 seconds
-    When executing query:
+    When executing query and retrying it on failure every 6 seconds for 3 times:
       """
       INSERT VERTEX t(id) VALUES 1:(1),2:(2),3:(2);
       INSERT EDGE e() VALUES 1->2:(),1->3:();
diff --git a/tests/tck/features/insert/Insert.feature b/tests/tck/features/insert/Insert.feature
index 7d298a293a2..f881ff17714 100644
--- a/tests/tck/features/insert/Insert.feature
+++ b/tests/tck/features/insert/Insert.feature
@@ -547,7 +547,7 @@ Feature: Insert string vid of vertex and edge
       """
     And wait 6 seconds
     # test insert vertex
-    When try to execute query:
+    When try to execute query and retrying it on failure every 6 seconds for 3 times:
       """
       INSERT VERTEX person(id) VALUES "100":(1), "200":(1)
       """
diff --git a/tests/tck/features/insert/insertVertexOnly.feature b/tests/tck/features/insert/insertVertexOnly.feature
index f8eb92ec5f6..f127d84a81a 100644
--- a/tests/tck/features/insert/insertVertexOnly.feature
+++ b/tests/tck/features/insert/insertVertexOnly.feature
@@ -16,7 +16,7 @@ Feature: insert vertex without tag
       CREATE EDGE e();
       """
     And wait 6 seconds
-    When executing query:
+    When executing query and retrying it on failure every 6 seconds for 3 times:
       """
       INSERT VERTEX VALUES 1:(),2:(),3:();
       INSERT EDGE e() VALUES 1->2:(),2->3:();
diff --git a/tests/tck/features/lookup/LookupTag2.feature b/tests/tck/features/lookup/LookupTag2.feature
index 1ed10b7d328..784653cdef7 100644
--- a/tests/tck/features/lookup/LookupTag2.feature
+++ b/tests/tck/features/lookup/LookupTag2.feature
@@ -58,7 +58,7 @@ Feature: Test lookup on tag index 2
     Then drop the used space
 
   Scenario Outline: [tag] scan without hints
-    When executing query:
+    When executing query and retrying it on failure every 6 seconds for 3 times:
       """
       LOOKUP ON
         lookup_tag_1