From 1c0157e00b41f89c36ad2725ae256b8f648e8e19 Mon Sep 17 00:00:00 2001
From: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com>
Date: Thu, 9 Sep 2021 14:18:24 +0800
Subject: [PATCH 1/5] Used to test the stability of TCK

---
 tests/common/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/common/utils.py b/tests/common/utils.py
index cb08622d45b..722298e10b7 100644
--- a/tests/common/utils.py
+++ b/tests/common/utils.py
@@ -426,7 +426,7 @@ def load_csv_data(
         for line in schemas.splitlines():
             resp_ok(sess, line.strip(), True)
 
-        # wait heartbeat_interval_secs seconds for schema synchronization
+        # wait heartbeat_interval_secs + 1 seconds for schema synchronization
         time.sleep(2)
 
         for fd in config["files"]:

From a8d1ac6688e5d0a4d231e3c1b57437712f3334d2 Mon Sep 17 00:00:00 2001
From: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com>
Date: Mon, 13 Sep 2021 14:51:48 +0800
Subject: [PATCH 2/5] Increase the delay time

---
 tests/tck/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tck/conftest.py b/tests/tck/conftest.py
index 3f0ead037a8..a4e59db4ca5 100644
--- a/tests/tck/conftest.py
+++ b/tests/tck/conftest.py
@@ -76,7 +76,7 @@ def wait_all_jobs_finished(sess, jobs=[]):
     times = 4 * get_running_jobs(sess)
     while jobs and times > 0:
         jobs = [job for job in jobs if not is_job_finished(sess, job)]
-        time.sleep(0.5)
+        time.sleep(1)
         times -= 1
     return len(jobs) == 0
 

From 6f6adf320a86d2c4f708a05e9d8392ffd6cedc51 Mon Sep 17 00:00:00 2001
From: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com>
Date: Mon, 13 Sep 2021 16:03:42 +0800
Subject: [PATCH 3/5] sleep heartbeat_inter_val + 1

---
 .../tck/features/expression/Predicate.feature |  2 +-
 tests/tck/features/index/Index.IntVid.feature | 42 +++--------------
 tests/tck/features/index/Index.feature        | 46 ++++---------------
 tests/tck/features/lookup/ByIndex.feature     |  2 +-
 .../features/lookup/ByIndex.intVid.feature    |  2 +-
 .../tck/features/lookup/LookUp.IntVid.feature | 22 ++++-----
 tests/tck/features/lookup/LookUp.feature      | 22 ++++-----
 tests/tck/features/lookup/LookupEdge.feature  |  4 +-
 tests/tck/features/lookup/LookupEdge2.feature |  2 +-
 tests/tck/features/lookup/LookupTag.feature   |  4 +-
 tests/tck/features/lookup/LookupTag2.feature  |  2 +-
 .../features/match/SeekById.intVid.feature    |  2 +-
 12 files changed, 46 insertions(+), 106 deletions(-)

diff --git a/tests/tck/features/expression/Predicate.feature b/tests/tck/features/expression/Predicate.feature
index dc05ae1afd8..08b1aedba4e 100644
--- a/tests/tck/features/expression/Predicate.feature
+++ b/tests/tck/features/expression/Predicate.feature
@@ -56,7 +56,7 @@ Feature: Predicate
       """
       CREATE TAG INDEX bachelor_name_index ON bachelor(name(20));
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When submit a job:
       """
       REBUILD TAG INDEX bachelor_name_index
diff --git a/tests/tck/features/index/Index.IntVid.feature b/tests/tck/features/index/Index.IntVid.feature
index a6aa4927ebf..fe793b7328d 100644
--- a/tests/tck/features/index/Index.IntVid.feature
+++ b/tests/tck/features/index/Index.IntVid.feature
@@ -57,7 +57,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX disorder_tag_index ON tag_1(col3, col2);
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -69,21 +69,6 @@ Feature: IndexTest_Vid_Int
         hash("Tom"):  ("Tom",  18, 11.11, `timestamp`("2000-10-10T10:00:00"))
       """
     Then the execution should be successful
-    When executing query:
-      """
-      REBUILD TAG INDEX single_tag_index;
-      """
-    Then the execution should be successful
-    When executing query:
-      """
-      REBUILD TAG INDEX single_tag_index OFFLINE;
-      """
-    Then a SyntaxError should be raised at runtime:
-    When executing query:
-      """
-      REBUILD TAG INDEX multi_tag_index;
-      """
-    Then the execution should be successful
     When executing query:
       """
       REBUILD TAG INDEX multi_tag_index OFFLINE;
@@ -210,7 +195,7 @@ Feature: IndexTest_Vid_Int
       CREATE EDGE INDEX disorder_edge_1_index ON edge_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT EDGE
@@ -222,21 +207,6 @@ Feature: IndexTest_Vid_Int
         hash("May")  ->  hash("Tim"):  ("Like", 18, 11.11, `timestamp`("2000-10-10T10:00:00"))
       """
     Then the execution should be successful
-    When executing query:
-      """
-      REBUILD EDGE INDEX single_edge_index
-      """
-    Then the execution should be successful
-    When executing query:
-      """
-      REBUILD EDGE INDEX single_edge_index OFFLINE;
-      """
-    Then a SyntaxError should be raised at runtime:
-    When executing query:
-      """
-      REBUILD EDGE INDEX multi_edge_1_index
-      """
-    Then the execution should be successful
     When executing query:
       """
       REBUILD EDGE INDEX multi_edge_1_index OFFLINE;
@@ -557,7 +527,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX single_person_index ON tag_1(col1)
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX tag_1(col1, col2, col3, col4) VALUES 100:(true,  18, 1.1, `timestamp`("2000-10-10T10:00:00"))
@@ -573,7 +543,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX single_person_index2 ON tag_1(col5)
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX tag_1(col1, col2, col3, col4, col5) VALUES 100:(true,  18, 1.1, `timestamp`("2000-10-10T10:00:00"), 5)
@@ -708,7 +678,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX alter_index ON alter_tag(id);
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX alter_tag(id) VALUES 100:(1), 200:(2)
@@ -718,7 +688,7 @@ Feature: IndexTest_Vid_Int
       """
       ALTER TAG alter_tag ADD (type int)
       """
-    And wait 6 seconds
+    And wait 2 seconds
     Then the execution should be successful
     When try to execute query:
       """
diff --git a/tests/tck/features/index/Index.feature b/tests/tck/features/index/Index.feature
index 0813917eacf..aaa74fbca6b 100644
--- a/tests/tck/features/index/Index.feature
+++ b/tests/tck/features/index/Index.feature
@@ -57,7 +57,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX disorder_tag_index ON tag_1(col3, col2);
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -69,21 +69,6 @@ Feature: IndexTest_Vid_String
         "Tom":  ("Tom",  18, 11.11, `timestamp`("2000-10-10T10:00:00"))
       """
     Then the execution should be successful
-    When executing query:
-      """
-      REBUILD TAG INDEX single_tag_index;
-      """
-    Then the execution should be successful
-    When executing query:
-      """
-      REBUILD TAG INDEX single_tag_index OFFLINE;
-      """
-    Then a SyntaxError should be raised at runtime:
-    When executing query:
-      """
-      REBUILD TAG INDEX multi_tag_index;
-      """
-    Then the execution should be successful
     When executing query:
       """
       REBUILD TAG INDEX multi_tag_index OFFLINE;
@@ -210,7 +195,7 @@ Feature: IndexTest_Vid_String
       CREATE EDGE INDEX disorder_edge_1_index ON edge_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT EDGE
@@ -222,21 +207,6 @@ Feature: IndexTest_Vid_String
         "May"  -> "Tim":  ("Like", 18, 11.11, `timestamp`("2000-10-10T10:00:00"))
       """
     Then the execution should be successful
-    When executing query:
-      """
-      REBUILD EDGE INDEX single_edge_index
-      """
-    Then the execution should be successful
-    When executing query:
-      """
-      REBUILD EDGE INDEX single_edge_index OFFLINE;
-      """
-    Then a SyntaxError should be raised at runtime:
-    When executing query:
-      """
-      REBUILD EDGE INDEX multi_edge_1_index
-      """
-    Then the execution should be successful
     When executing query:
       """
       REBUILD EDGE INDEX multi_edge_1_index OFFLINE;
@@ -714,7 +684,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX alter_index ON alter_tag(id);
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX alter_tag(id) VALUES "100":(1), "200":(2)
@@ -725,7 +695,7 @@ Feature: IndexTest_Vid_String
       ALTER TAG alter_tag ADD (type int)
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       LOOKUP ON alter_tag WHERE alter_tag.id == 1 YIELD alter_tag.type
@@ -755,7 +725,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX name_tag_index ON name_tag(name(10));
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When submit a job:
       """
       REBUILD TAG INDEX;
@@ -810,7 +780,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX age_tag_index ON age_tag(age);
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When submit a job:
       """
       REBUILD TAG INDEX id_tag_index, name_tag_index;
@@ -869,7 +839,7 @@ Feature: IndexTest_Vid_String
       CREATE EDGE INDEX name_edge_index ON name_edge(name(10));
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX;
@@ -922,7 +892,7 @@ Feature: IndexTest_Vid_String
       CREATE EDGE INDEX age_edge_index ON age_edge(age);
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX id_edge_index,name_edge_index;
diff --git a/tests/tck/features/lookup/ByIndex.feature b/tests/tck/features/lookup/ByIndex.feature
index b588a587e69..df91c34dccb 100644
--- a/tests/tck/features/lookup/ByIndex.feature
+++ b/tests/tck/features/lookup/ByIndex.feature
@@ -555,7 +555,7 @@ Feature: Lookup by index itself
       CREATE TAG weight (WEIGHT double);
       CREATE TAG INDEX weight_index ON weight(WEIGHT);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX weight(WEIGHT) VALUES "Tim Duncan" : (70.5);
diff --git a/tests/tck/features/lookup/ByIndex.intVid.feature b/tests/tck/features/lookup/ByIndex.intVid.feature
index e595d6e5879..f6ae70c3ca8 100644
--- a/tests/tck/features/lookup/ByIndex.intVid.feature
+++ b/tests/tck/features/lookup/ByIndex.intVid.feature
@@ -555,7 +555,7 @@ Feature: Lookup by index itself in integer vid
       CREATE TAG weight (WEIGHT double);
       CREATE TAG INDEX weight_index ON weight(WEIGHT);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX weight(WEIGHT) VALUES hash("Tim Duncan") : (70.5);
diff --git a/tests/tck/features/lookup/LookUp.IntVid.feature b/tests/tck/features/lookup/LookUp.IntVid.feature
index 3628a5cd477..5aeea6bf2a7 100644
--- a/tests/tck/features/lookup/LookUp.IntVid.feature
+++ b/tests/tck/features/lookup/LookUp.IntVid.feature
@@ -20,7 +20,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -56,7 +56,7 @@ Feature: LookUpTest_Vid_Int
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT EDGE
@@ -88,7 +88,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -238,7 +238,7 @@ Feature: LookUpTest_Vid_Int
       CREATE EDGE INDEX e_index_2 ON lookup_edge_2(col2, col3, col4);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT EDGE
@@ -383,7 +383,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -521,7 +521,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG teacher(number int, age int)
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -586,7 +586,7 @@ Feature: LookUpTest_Vid_Int
       """
       CREATE TAG INDEX i5 ON t1(c1, c2, c3, c5)
       """
-    And wait 6 seconds
+    And wait 2 seconds
     Then the execution should be successful
     When executing query:
       """
@@ -670,7 +670,7 @@ Feature: LookUpTest_Vid_Int
       """
       CREATE TAG INDEX i5_str ON t1_str(c1, c2, c3(30), c4(30))
       """
-    And wait 6 seconds
+    And wait 2 seconds
     Then the execution should be successful
     When executing query:
       """
@@ -735,7 +735,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX i3_with_str ON tag_with_str(c1, c2(30), c3(30))
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -807,7 +807,7 @@ Feature: LookUpTest_Vid_Int
         identity(BIRTHDAY, NATION(30), BIRTHPLACE_CITY(30))
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When try to execute query:
       """
       INSERT VERTEX identity (BIRTHDAY, NATION, BIRTHPLACE_CITY) VALUES 1:(19860413, "汉族", "aaa")
@@ -832,7 +832,7 @@ Feature: LookUpTest_Vid_Int
       """
       CREATE TAG player(name string, age int);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX player(name, age) VALUES hash('Tim'):('Tim', 20);
diff --git a/tests/tck/features/lookup/LookUp.feature b/tests/tck/features/lookup/LookUp.feature
index 6afca5f523f..f741e17f001 100644
--- a/tests/tck/features/lookup/LookUp.feature
+++ b/tests/tck/features/lookup/LookUp.feature
@@ -18,7 +18,7 @@ Feature: LookUpTest_Vid_String
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -54,7 +54,7 @@ Feature: LookUpTest_Vid_String
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT EDGE
@@ -86,7 +86,7 @@ Feature: LookUpTest_Vid_String
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -236,7 +236,7 @@ Feature: LookUpTest_Vid_String
       CREATE EDGE INDEX e_index_2 ON lookup_edge_2(col2, col3, col4);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT EDGE
@@ -381,7 +381,7 @@ Feature: LookUpTest_Vid_String
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -510,7 +510,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG teacher(number int, age int)
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX student(number, age), teacher(number, age)  VALUES "220":(1, 20, 1, 30), "221":(2, 22, 2, 32)
@@ -565,7 +565,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG INDEX i5 ON t1(c1, c2, c3, c5)
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       LOOKUP ON t1 WHERE t1.c1 == 1
@@ -643,7 +643,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG INDEX i5_str ON t1_str(c1, c2, c3(30), c4(30))
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       LOOKUP ON t1_str WHERE t1_str.c1 == 1
@@ -703,7 +703,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG INDEX i3_with_str ON tag_with_str(c1, c2(30), c3(30))
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -773,7 +773,7 @@ Feature: LookUpTest_Vid_String
       ON
         identity(BIRTHDAY, NATION(30), BIRTHPLACE_CITY(30))
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX identity(BIRTHDAY, NATION, BIRTHPLACE_CITY) VALUES "1" : (19860413, "汉族", "aaa")
@@ -963,7 +963,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG player(name string, age int);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     When executing query:
       """
       INSERT VERTEX player(name, age) VALUES 'Tim':('Tim', 20);
diff --git a/tests/tck/features/lookup/LookupEdge.feature b/tests/tck/features/lookup/LookupEdge.feature
index b4cac6c2e86..b36744ad97d 100644
--- a/tests/tck/features/lookup/LookupEdge.feature
+++ b/tests/tck/features/lookup/LookupEdge.feature
@@ -39,7 +39,7 @@ Feature: Test lookup on edge index
       CREATE EDGE INDEX e_index_1 ON lookup_edge_1(col1, col2, col3);
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     And having executed:
       """
       INSERT EDGE
@@ -86,7 +86,7 @@ Feature: Test lookup on edge index
       CREATE EDGE INDEX e_index_1 ON lookup_edge_1(col1, col2, col3);
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     And having executed:
       """
       INSERT EDGE
diff --git a/tests/tck/features/lookup/LookupEdge2.feature b/tests/tck/features/lookup/LookupEdge2.feature
index 1e7f6a536ed..abe9add7ea5 100644
--- a/tests/tck/features/lookup/LookupEdge2.feature
+++ b/tests/tck/features/lookup/LookupEdge2.feature
@@ -16,7 +16,7 @@ Feature: Test lookup on edge index 2
       CREATE EDGE INDEX e_index_1 ON lookup_edge_1(col1, col2, col3);
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     And having executed:
       """
       INSERT EDGE
diff --git a/tests/tck/features/lookup/LookupTag.feature b/tests/tck/features/lookup/LookupTag.feature
index c499a77b808..819f88e0aa7 100644
--- a/tests/tck/features/lookup/LookupTag.feature
+++ b/tests/tck/features/lookup/LookupTag.feature
@@ -38,7 +38,7 @@ Feature: Test lookup on tag index
       CREATE TAG INDEX t_index_1 ON lookup_tag_1(col1, col2, col3);
       CREATE TAG INDEX t_index_3 ON lookup_tag_1(col2, col3);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     And having executed:
       """
       INSERT VERTEX
@@ -86,7 +86,7 @@ Feature: Test lookup on tag index
       CREATE TAG INDEX t_index_1 ON lookup_tag_1(col1, col2, col3);
       CREATE TAG INDEX t_index_3 ON lookup_tag_1(col2, col3);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     And having executed:
       """
       INSERT VERTEX
diff --git a/tests/tck/features/lookup/LookupTag2.feature b/tests/tck/features/lookup/LookupTag2.feature
index 46b594b0aa1..4276a0cda9c 100644
--- a/tests/tck/features/lookup/LookupTag2.feature
+++ b/tests/tck/features/lookup/LookupTag2.feature
@@ -16,7 +16,7 @@ Feature: Test lookup on tag index 2
       CREATE TAG INDEX t_index_1 ON lookup_tag_1(col1, col2, col3);
       CREATE TAG INDEX t_index_3 ON lookup_tag_1(col2, col3);
       """
-    And wait 6 seconds
+    And wait 2 seconds
     And having executed:
       """
       INSERT VERTEX
diff --git a/tests/tck/features/match/SeekById.intVid.feature b/tests/tck/features/match/SeekById.intVid.feature
index 94af09015fb..abc93fffef1 100644
--- a/tests/tck/features/match/SeekById.intVid.feature
+++ b/tests/tck/features/match/SeekById.intVid.feature
@@ -289,7 +289,7 @@ Feature: Match seek by id
       CREATE TAG INDEX player_name_index ON player(name(10));
       """
     Then the execution should be successful
-    And wait 6 seconds
+    And wait 2 seconds
     When submit a job:
       """
       REBUILD TAG INDEX player_name_index;

From 51172db32d1d44cfa12855f6165a5be2f805bdbc Mon Sep 17 00:00:00 2001
From: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com>
Date: Mon, 13 Sep 2021 16:25:00 +0800
Subject: [PATCH 4/5] And wait 3 seconds

---
 .../tck/features/expression/Predicate.feature |  2 +-
 tests/tck/features/index/Index.IntVid.feature | 12 +++++-----
 tests/tck/features/index/Index.feature        | 16 ++++++-------
 tests/tck/features/index/TagEdgeIndex.feature | 24 ++-----------------
 tests/tck/features/lookup/ByIndex.feature     |  2 +-
 .../features/lookup/ByIndex.intVid.feature    |  2 +-
 .../tck/features/lookup/LookUp.IntVid.feature | 22 ++++++++---------
 tests/tck/features/lookup/LookUp.feature      | 22 ++++++++---------
 tests/tck/features/lookup/LookupEdge.feature  |  4 ++--
 tests/tck/features/lookup/LookupEdge2.feature |  2 +-
 tests/tck/features/lookup/LookupTag.feature   |  4 ++--
 tests/tck/features/lookup/LookupTag2.feature  |  2 +-
 .../features/match/SeekById.intVid.feature    | 13 ++++------
 13 files changed, 51 insertions(+), 76 deletions(-)

diff --git a/tests/tck/features/expression/Predicate.feature b/tests/tck/features/expression/Predicate.feature
index 08b1aedba4e..28b73825cbb 100644
--- a/tests/tck/features/expression/Predicate.feature
+++ b/tests/tck/features/expression/Predicate.feature
@@ -56,7 +56,7 @@ Feature: Predicate
       """
       CREATE TAG INDEX bachelor_name_index ON bachelor(name(20));
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When submit a job:
       """
       REBUILD TAG INDEX bachelor_name_index
diff --git a/tests/tck/features/index/Index.IntVid.feature b/tests/tck/features/index/Index.IntVid.feature
index fe793b7328d..41be8035edb 100644
--- a/tests/tck/features/index/Index.IntVid.feature
+++ b/tests/tck/features/index/Index.IntVid.feature
@@ -57,7 +57,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX disorder_tag_index ON tag_1(col3, col2);
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -195,7 +195,7 @@ Feature: IndexTest_Vid_Int
       CREATE EDGE INDEX disorder_edge_1_index ON edge_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT EDGE
@@ -527,7 +527,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX single_person_index ON tag_1(col1)
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX tag_1(col1, col2, col3, col4) VALUES 100:(true,  18, 1.1, `timestamp`("2000-10-10T10:00:00"))
@@ -543,7 +543,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX single_person_index2 ON tag_1(col5)
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX tag_1(col1, col2, col3, col4, col5) VALUES 100:(true,  18, 1.1, `timestamp`("2000-10-10T10:00:00"), 5)
@@ -678,7 +678,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX alter_index ON alter_tag(id);
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX alter_tag(id) VALUES 100:(1), 200:(2)
@@ -688,7 +688,7 @@ Feature: IndexTest_Vid_Int
       """
       ALTER TAG alter_tag ADD (type int)
       """
-    And wait 2 seconds
+    And wait 3 seconds
     Then the execution should be successful
     When try to execute query:
       """
diff --git a/tests/tck/features/index/Index.feature b/tests/tck/features/index/Index.feature
index aaa74fbca6b..1b550bd2276 100644
--- a/tests/tck/features/index/Index.feature
+++ b/tests/tck/features/index/Index.feature
@@ -57,7 +57,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX disorder_tag_index ON tag_1(col3, col2);
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -195,7 +195,7 @@ Feature: IndexTest_Vid_String
       CREATE EDGE INDEX disorder_edge_1_index ON edge_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT EDGE
@@ -684,7 +684,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX alter_index ON alter_tag(id);
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX alter_tag(id) VALUES "100":(1), "200":(2)
@@ -695,7 +695,7 @@ Feature: IndexTest_Vid_String
       ALTER TAG alter_tag ADD (type int)
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       LOOKUP ON alter_tag WHERE alter_tag.id == 1 YIELD alter_tag.type
@@ -725,7 +725,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX name_tag_index ON name_tag(name(10));
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When submit a job:
       """
       REBUILD TAG INDEX;
@@ -780,7 +780,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX age_tag_index ON age_tag(age);
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When submit a job:
       """
       REBUILD TAG INDEX id_tag_index, name_tag_index;
@@ -839,7 +839,7 @@ Feature: IndexTest_Vid_String
       CREATE EDGE INDEX name_edge_index ON name_edge(name(10));
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX;
@@ -892,7 +892,7 @@ Feature: IndexTest_Vid_String
       CREATE EDGE INDEX age_edge_index ON age_edge(age);
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX id_edge_index,name_edge_index;
diff --git a/tests/tck/features/index/TagEdgeIndex.feature b/tests/tck/features/index/TagEdgeIndex.feature
index 266cb3c14b8..9fe662112e7 100644
--- a/tests/tck/features/index/TagEdgeIndex.feature
+++ b/tests/tck/features/index/TagEdgeIndex.feature
@@ -83,17 +83,7 @@ Feature: tag and edge index tests from pytest
     And wait 3 seconds
     When submit a job:
       """
-      REBUILD TAG INDEX single_tag_index
-      """
-    Then wait the job to finish
-    When submit a job:
-      """
-      REBUILD TAG INDEX multi_tag_index
-      """
-    Then wait the job to finish
-    When submit a job:
-      """
-      REBUILD TAG INDEX disorder_tag_index
+      REBUILD TAG INDEX single_tag_index, multi_tag_index, disorder_tag_index
       """
     Then wait the job to finish
     When executing query:
@@ -330,17 +320,7 @@ Feature: tag and edge index tests from pytest
     # Rebuild Edge Index
     When submit a job:
       """
-      REBUILD EDGE INDEX single_edge_index
-      """
-    Then wait the job to finish
-    When submit a job:
-      """
-      REBUILD EDGE INDEX multi_edge_index
-      """
-    Then wait the job to finish
-    When submit a job:
-      """
-      REBUILD EDGE INDEX disorder_edge_index
+      REBUILD EDGE INDEX single_edge_index, multi_edge_index, disorder_edge_index
       """
     Then wait the job to finish
     When executing query:
diff --git a/tests/tck/features/lookup/ByIndex.feature b/tests/tck/features/lookup/ByIndex.feature
index df91c34dccb..910a1d88f2c 100644
--- a/tests/tck/features/lookup/ByIndex.feature
+++ b/tests/tck/features/lookup/ByIndex.feature
@@ -555,7 +555,7 @@ Feature: Lookup by index itself
       CREATE TAG weight (WEIGHT double);
       CREATE TAG INDEX weight_index ON weight(WEIGHT);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX weight(WEIGHT) VALUES "Tim Duncan" : (70.5);
diff --git a/tests/tck/features/lookup/ByIndex.intVid.feature b/tests/tck/features/lookup/ByIndex.intVid.feature
index f6ae70c3ca8..a8bf3f4fd4f 100644
--- a/tests/tck/features/lookup/ByIndex.intVid.feature
+++ b/tests/tck/features/lookup/ByIndex.intVid.feature
@@ -555,7 +555,7 @@ Feature: Lookup by index itself in integer vid
       CREATE TAG weight (WEIGHT double);
       CREATE TAG INDEX weight_index ON weight(WEIGHT);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX weight(WEIGHT) VALUES hash("Tim Duncan") : (70.5);
diff --git a/tests/tck/features/lookup/LookUp.IntVid.feature b/tests/tck/features/lookup/LookUp.IntVid.feature
index 5aeea6bf2a7..4c1305b197b 100644
--- a/tests/tck/features/lookup/LookUp.IntVid.feature
+++ b/tests/tck/features/lookup/LookUp.IntVid.feature
@@ -20,7 +20,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -56,7 +56,7 @@ Feature: LookUpTest_Vid_Int
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT EDGE
@@ -88,7 +88,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -238,7 +238,7 @@ Feature: LookUpTest_Vid_Int
       CREATE EDGE INDEX e_index_2 ON lookup_edge_2(col2, col3, col4);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT EDGE
@@ -383,7 +383,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -521,7 +521,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG teacher(number int, age int)
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -586,7 +586,7 @@ Feature: LookUpTest_Vid_Int
       """
       CREATE TAG INDEX i5 ON t1(c1, c2, c3, c5)
       """
-    And wait 2 seconds
+    And wait 3 seconds
     Then the execution should be successful
     When executing query:
       """
@@ -670,7 +670,7 @@ Feature: LookUpTest_Vid_Int
       """
       CREATE TAG INDEX i5_str ON t1_str(c1, c2, c3(30), c4(30))
       """
-    And wait 2 seconds
+    And wait 3 seconds
     Then the execution should be successful
     When executing query:
       """
@@ -735,7 +735,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX i3_with_str ON tag_with_str(c1, c2(30), c3(30))
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -807,7 +807,7 @@ Feature: LookUpTest_Vid_Int
         identity(BIRTHDAY, NATION(30), BIRTHPLACE_CITY(30))
       """
     Then the execution should be successful
-    And wait 2 seconds
+    And wait 3 seconds
     When try to execute query:
       """
       INSERT VERTEX identity (BIRTHDAY, NATION, BIRTHPLACE_CITY) VALUES 1:(19860413, "汉族", "aaa")
@@ -832,7 +832,7 @@ Feature: LookUpTest_Vid_Int
       """
       CREATE TAG player(name string, age int);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX player(name, age) VALUES hash('Tim'):('Tim', 20);
diff --git a/tests/tck/features/lookup/LookUp.feature b/tests/tck/features/lookup/LookUp.feature
index f741e17f001..17291d75b3d 100644
--- a/tests/tck/features/lookup/LookUp.feature
+++ b/tests/tck/features/lookup/LookUp.feature
@@ -18,7 +18,7 @@ Feature: LookUpTest_Vid_String
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -54,7 +54,7 @@ Feature: LookUpTest_Vid_String
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT EDGE
@@ -86,7 +86,7 @@ Feature: LookUpTest_Vid_String
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -236,7 +236,7 @@ Feature: LookUpTest_Vid_String
       CREATE EDGE INDEX e_index_2 ON lookup_edge_2(col2, col3, col4);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT EDGE
@@ -381,7 +381,7 @@ Feature: LookUpTest_Vid_String
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -510,7 +510,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG teacher(number int, age int)
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX student(number, age), teacher(number, age)  VALUES "220":(1, 20, 1, 30), "221":(2, 22, 2, 32)
@@ -565,7 +565,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG INDEX i5 ON t1(c1, c2, c3, c5)
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       LOOKUP ON t1 WHERE t1.c1 == 1
@@ -643,7 +643,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG INDEX i5_str ON t1_str(c1, c2, c3(30), c4(30))
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       LOOKUP ON t1_str WHERE t1_str.c1 == 1
@@ -703,7 +703,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG INDEX i3_with_str ON tag_with_str(c1, c2(30), c3(30))
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -773,7 +773,7 @@ Feature: LookUpTest_Vid_String
       ON
         identity(BIRTHDAY, NATION(30), BIRTHPLACE_CITY(30))
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX identity(BIRTHDAY, NATION, BIRTHPLACE_CITY) VALUES "1" : (19860413, "汉族", "aaa")
@@ -963,7 +963,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG player(name string, age int);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     When executing query:
       """
       INSERT VERTEX player(name, age) VALUES 'Tim':('Tim', 20);
diff --git a/tests/tck/features/lookup/LookupEdge.feature b/tests/tck/features/lookup/LookupEdge.feature
index b36744ad97d..f4c5936285c 100644
--- a/tests/tck/features/lookup/LookupEdge.feature
+++ b/tests/tck/features/lookup/LookupEdge.feature
@@ -39,7 +39,7 @@ Feature: Test lookup on edge index
       CREATE EDGE INDEX e_index_1 ON lookup_edge_1(col1, col2, col3);
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     And having executed:
       """
       INSERT EDGE
@@ -86,7 +86,7 @@ Feature: Test lookup on edge index
       CREATE EDGE INDEX e_index_1 ON lookup_edge_1(col1, col2, col3);
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     And having executed:
       """
       INSERT EDGE
diff --git a/tests/tck/features/lookup/LookupEdge2.feature b/tests/tck/features/lookup/LookupEdge2.feature
index abe9add7ea5..18f1e408e7b 100644
--- a/tests/tck/features/lookup/LookupEdge2.feature
+++ b/tests/tck/features/lookup/LookupEdge2.feature
@@ -16,7 +16,7 @@ Feature: Test lookup on edge index 2
       CREATE EDGE INDEX e_index_1 ON lookup_edge_1(col1, col2, col3);
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     And having executed:
       """
       INSERT EDGE
diff --git a/tests/tck/features/lookup/LookupTag.feature b/tests/tck/features/lookup/LookupTag.feature
index 819f88e0aa7..ad4a8c43f06 100644
--- a/tests/tck/features/lookup/LookupTag.feature
+++ b/tests/tck/features/lookup/LookupTag.feature
@@ -38,7 +38,7 @@ Feature: Test lookup on tag index
       CREATE TAG INDEX t_index_1 ON lookup_tag_1(col1, col2, col3);
       CREATE TAG INDEX t_index_3 ON lookup_tag_1(col2, col3);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     And having executed:
       """
       INSERT VERTEX
@@ -86,7 +86,7 @@ Feature: Test lookup on tag index
       CREATE TAG INDEX t_index_1 ON lookup_tag_1(col1, col2, col3);
       CREATE TAG INDEX t_index_3 ON lookup_tag_1(col2, col3);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     And having executed:
       """
       INSERT VERTEX
diff --git a/tests/tck/features/lookup/LookupTag2.feature b/tests/tck/features/lookup/LookupTag2.feature
index 4276a0cda9c..b37d83fd35c 100644
--- a/tests/tck/features/lookup/LookupTag2.feature
+++ b/tests/tck/features/lookup/LookupTag2.feature
@@ -16,7 +16,7 @@ Feature: Test lookup on tag index 2
       CREATE TAG INDEX t_index_1 ON lookup_tag_1(col1, col2, col3);
       CREATE TAG INDEX t_index_3 ON lookup_tag_1(col2, col3);
       """
-    And wait 2 seconds
+    And wait 3 seconds
     And having executed:
       """
       INSERT VERTEX
diff --git a/tests/tck/features/match/SeekById.intVid.feature b/tests/tck/features/match/SeekById.intVid.feature
index abc93fffef1..f389214f2c0 100644
--- a/tests/tck/features/match/SeekById.intVid.feature
+++ b/tests/tck/features/match/SeekById.intVid.feature
@@ -279,22 +279,17 @@ Feature: Match seek by id
       """
       CREATE TAG player(name string, age int);
       """
-    When try to execute query:
-      """
-      INSERT VERTEX player(name, age) VALUES -100:("Tim", 32);
-      """
-    Then the execution should be successful
     When executing query:
       """
       CREATE TAG INDEX player_name_index ON player(name(10));
       """
     Then the execution should be successful
-    And wait 2 seconds
-    When submit a job:
+    And wait 3 seconds
+    When try to execute query:
       """
-      REBUILD TAG INDEX player_name_index;
+      INSERT VERTEX player(name, age) VALUES -100:("Tim", 32);
       """
-    Then wait the job to finish
+    Then the execution should be successful
     When executing query:
       """
       MATCH (v) WHERE id(v) == -100 RETURN v;

From a57f9ceeeca283392d286ebf878ec1c8953612ee Mon Sep 17 00:00:00 2001
From: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com>
Date: Tue, 14 Sep 2021 15:35:03 +0800
Subject: [PATCH 5/5] And wait 6 seconds

---
 .../tck/features/expression/Predicate.feature |  2 +-
 tests/tck/features/index/Index.IntVid.feature | 16 ++++++-------
 tests/tck/features/index/Index.feature        | 24 +++++++++----------
 tests/tck/features/index/TagEdgeIndex.feature |  4 ++--
 tests/tck/features/lookup/ByIndex.feature     |  2 +-
 .../features/lookup/ByIndex.intVid.feature    |  2 +-
 .../features/lookup/EdgeIndexFullScan.feature |  4 +---
 .../tck/features/lookup/LookUp.IntVid.feature | 22 ++++++++---------
 tests/tck/features/lookup/LookUp.feature      | 22 ++++++++---------
 tests/tck/features/lookup/LookupEdge.feature  |  4 ++--
 tests/tck/features/lookup/LookupEdge2.feature |  2 +-
 tests/tck/features/lookup/LookupTag.feature   |  4 ++--
 tests/tck/features/lookup/LookupTag2.feature  |  2 +-
 .../features/match/SeekById.intVid.feature    |  2 +-
 14 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/tests/tck/features/expression/Predicate.feature b/tests/tck/features/expression/Predicate.feature
index 28b73825cbb..dc05ae1afd8 100644
--- a/tests/tck/features/expression/Predicate.feature
+++ b/tests/tck/features/expression/Predicate.feature
@@ -56,7 +56,7 @@ Feature: Predicate
       """
       CREATE TAG INDEX bachelor_name_index ON bachelor(name(20));
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD TAG INDEX bachelor_name_index
diff --git a/tests/tck/features/index/Index.IntVid.feature b/tests/tck/features/index/Index.IntVid.feature
index 41be8035edb..a5534596fcd 100644
--- a/tests/tck/features/index/Index.IntVid.feature
+++ b/tests/tck/features/index/Index.IntVid.feature
@@ -57,7 +57,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX disorder_tag_index ON tag_1(col3, col2);
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -195,7 +195,7 @@ Feature: IndexTest_Vid_Int
       CREATE EDGE INDEX disorder_edge_1_index ON edge_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT EDGE
@@ -527,7 +527,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX single_person_index ON tag_1(col1)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX tag_1(col1, col2, col3, col4) VALUES 100:(true,  18, 1.1, `timestamp`("2000-10-10T10:00:00"))
@@ -543,7 +543,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX single_person_index2 ON tag_1(col5)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX tag_1(col1, col2, col3, col4, col5) VALUES 100:(true,  18, 1.1, `timestamp`("2000-10-10T10:00:00"), 5)
@@ -588,7 +588,7 @@ Feature: IndexTest_Vid_Int
       """
     Then the result should be, in any order:
       | Name | Index Status |
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD TAG INDEX tag_index_status
@@ -636,7 +636,7 @@ Feature: IndexTest_Vid_Int
       """
     Then the result should be, in any order:
       | Name | Index Status |
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX edge_index_status
@@ -678,7 +678,7 @@ Feature: IndexTest_Vid_Int
       CREATE TAG INDEX alter_index ON alter_tag(id);
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX alter_tag(id) VALUES 100:(1), 200:(2)
@@ -688,7 +688,7 @@ Feature: IndexTest_Vid_Int
       """
       ALTER TAG alter_tag ADD (type int)
       """
-    And wait 3 seconds
+    And wait 6 seconds
     Then the execution should be successful
     When try to execute query:
       """
diff --git a/tests/tck/features/index/Index.feature b/tests/tck/features/index/Index.feature
index 1b550bd2276..432dd06153c 100644
--- a/tests/tck/features/index/Index.feature
+++ b/tests/tck/features/index/Index.feature
@@ -57,7 +57,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX disorder_tag_index ON tag_1(col3, col2);
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -195,7 +195,7 @@ Feature: IndexTest_Vid_String
       CREATE EDGE INDEX disorder_edge_1_index ON edge_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT EDGE
@@ -527,7 +527,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX single_person_index ON tag_1(col1)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -546,7 +546,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX single_person_index2 ON tag_1(col5)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -594,7 +594,7 @@ Feature: IndexTest_Vid_String
       """
     Then the result should be, in any order:
       | Name | Index Status |
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD TAG INDEX tag_index_status
@@ -642,7 +642,7 @@ Feature: IndexTest_Vid_String
       """
     Then the result should be, in any order:
       | Name | Index Status |
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX edge_index_status
@@ -684,7 +684,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX alter_index ON alter_tag(id);
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX alter_tag(id) VALUES "100":(1), "200":(2)
@@ -695,7 +695,7 @@ Feature: IndexTest_Vid_String
       ALTER TAG alter_tag ADD (type int)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       LOOKUP ON alter_tag WHERE alter_tag.id == 1 YIELD alter_tag.type
@@ -725,7 +725,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX name_tag_index ON name_tag(name(10));
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD TAG INDEX;
@@ -780,7 +780,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX age_tag_index ON age_tag(age);
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD TAG INDEX id_tag_index, name_tag_index;
@@ -839,7 +839,7 @@ Feature: IndexTest_Vid_String
       CREATE EDGE INDEX name_edge_index ON name_edge(name(10));
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX;
@@ -892,7 +892,7 @@ Feature: IndexTest_Vid_String
       CREATE EDGE INDEX age_edge_index ON age_edge(age);
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX id_edge_index,name_edge_index;
diff --git a/tests/tck/features/index/TagEdgeIndex.feature b/tests/tck/features/index/TagEdgeIndex.feature
index 9fe662112e7..2412243eb56 100644
--- a/tests/tck/features/index/TagEdgeIndex.feature
+++ b/tests/tck/features/index/TagEdgeIndex.feature
@@ -80,7 +80,7 @@ Feature: tag and edge index tests from pytest
       CREATE TAG INDEX disorder_tag_index ON tag_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD TAG INDEX single_tag_index, multi_tag_index, disorder_tag_index
@@ -316,7 +316,7 @@ Feature: tag and edge index tests from pytest
       CREATE EDGE INDEX disorder_edge_index ON edge_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     # Rebuild Edge Index
     When submit a job:
       """
diff --git a/tests/tck/features/lookup/ByIndex.feature b/tests/tck/features/lookup/ByIndex.feature
index 910a1d88f2c..b588a587e69 100644
--- a/tests/tck/features/lookup/ByIndex.feature
+++ b/tests/tck/features/lookup/ByIndex.feature
@@ -555,7 +555,7 @@ Feature: Lookup by index itself
       CREATE TAG weight (WEIGHT double);
       CREATE TAG INDEX weight_index ON weight(WEIGHT);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX weight(WEIGHT) VALUES "Tim Duncan" : (70.5);
diff --git a/tests/tck/features/lookup/ByIndex.intVid.feature b/tests/tck/features/lookup/ByIndex.intVid.feature
index a8bf3f4fd4f..e595d6e5879 100644
--- a/tests/tck/features/lookup/ByIndex.intVid.feature
+++ b/tests/tck/features/lookup/ByIndex.intVid.feature
@@ -555,7 +555,7 @@ Feature: Lookup by index itself in integer vid
       CREATE TAG weight (WEIGHT double);
       CREATE TAG INDEX weight_index ON weight(WEIGHT);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX weight(WEIGHT) VALUES hash("Tim Duncan") : (70.5);
diff --git a/tests/tck/features/lookup/EdgeIndexFullScan.feature b/tests/tck/features/lookup/EdgeIndexFullScan.feature
index 22dfc781a31..293eaa339e3 100644
--- a/tests/tck/features/lookup/EdgeIndexFullScan.feature
+++ b/tests/tck/features/lookup/EdgeIndexFullScan.feature
@@ -12,7 +12,6 @@ Feature: Lookup edge index full scan
       """
       CREATE EDGE edge_1(col1_str string, col2_int int);
       """
-    And wait 3 seconds
     # index on col1_str
     And having executed:
       """
@@ -23,7 +22,7 @@ Feature: Lookup edge index full scan
       """
       CREATE EDGE INDEX col2_int_index ON edge_1(col2_int)
       """
-    And wait 3 seconds
+    And wait 6 seconds
     And having executed:
       """
       INSERT EDGE
@@ -33,7 +32,6 @@ Feature: Lookup edge index full scan
         '102'->'103':('Yellow', 22),
         '103'->'101':('Blue', 33);
       """
-    And wait 3 seconds
 
   Scenario: Edge with relational RegExp filter[1]
     When executing query:
diff --git a/tests/tck/features/lookup/LookUp.IntVid.feature b/tests/tck/features/lookup/LookUp.IntVid.feature
index 4c1305b197b..3628a5cd477 100644
--- a/tests/tck/features/lookup/LookUp.IntVid.feature
+++ b/tests/tck/features/lookup/LookUp.IntVid.feature
@@ -20,7 +20,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -56,7 +56,7 @@ Feature: LookUpTest_Vid_Int
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT EDGE
@@ -88,7 +88,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -238,7 +238,7 @@ Feature: LookUpTest_Vid_Int
       CREATE EDGE INDEX e_index_2 ON lookup_edge_2(col2, col3, col4);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT EDGE
@@ -383,7 +383,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -521,7 +521,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG teacher(number int, age int)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -586,7 +586,7 @@ Feature: LookUpTest_Vid_Int
       """
       CREATE TAG INDEX i5 ON t1(c1, c2, c3, c5)
       """
-    And wait 3 seconds
+    And wait 6 seconds
     Then the execution should be successful
     When executing query:
       """
@@ -670,7 +670,7 @@ Feature: LookUpTest_Vid_Int
       """
       CREATE TAG INDEX i5_str ON t1_str(c1, c2, c3(30), c4(30))
       """
-    And wait 3 seconds
+    And wait 6 seconds
     Then the execution should be successful
     When executing query:
       """
@@ -735,7 +735,7 @@ Feature: LookUpTest_Vid_Int
       CREATE TAG INDEX i3_with_str ON tag_with_str(c1, c2(30), c3(30))
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -807,7 +807,7 @@ Feature: LookUpTest_Vid_Int
         identity(BIRTHDAY, NATION(30), BIRTHPLACE_CITY(30))
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX identity (BIRTHDAY, NATION, BIRTHPLACE_CITY) VALUES 1:(19860413, "汉族", "aaa")
@@ -832,7 +832,7 @@ Feature: LookUpTest_Vid_Int
       """
       CREATE TAG player(name string, age int);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX player(name, age) VALUES hash('Tim'):('Tim', 20);
diff --git a/tests/tck/features/lookup/LookUp.feature b/tests/tck/features/lookup/LookUp.feature
index 17291d75b3d..6afca5f523f 100644
--- a/tests/tck/features/lookup/LookUp.feature
+++ b/tests/tck/features/lookup/LookUp.feature
@@ -18,7 +18,7 @@ Feature: LookUpTest_Vid_String
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -54,7 +54,7 @@ Feature: LookUpTest_Vid_String
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT EDGE
@@ -86,7 +86,7 @@ Feature: LookUpTest_Vid_String
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -236,7 +236,7 @@ Feature: LookUpTest_Vid_String
       CREATE EDGE INDEX e_index_2 ON lookup_edge_2(col2, col3, col4);
       CREATE EDGE INDEX e_index_4 ON lookup_edge_2(col3, col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT EDGE
@@ -381,7 +381,7 @@ Feature: LookUpTest_Vid_String
       CREATE TAG INDEX t_index_4 ON lookup_tag_2(col3, col4);
       CREATE TAG INDEX t_index_5 ON lookup_tag_2(col4);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -510,7 +510,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG teacher(number int, age int)
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX student(number, age), teacher(number, age)  VALUES "220":(1, 20, 1, 30), "221":(2, 22, 2, 32)
@@ -565,7 +565,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG INDEX i5 ON t1(c1, c2, c3, c5)
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       LOOKUP ON t1 WHERE t1.c1 == 1
@@ -643,7 +643,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG INDEX i5_str ON t1_str(c1, c2, c3(30), c4(30))
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       LOOKUP ON t1_str WHERE t1_str.c1 == 1
@@ -703,7 +703,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG INDEX i3_with_str ON tag_with_str(c1, c2(30), c3(30))
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX
@@ -773,7 +773,7 @@ Feature: LookUpTest_Vid_String
       ON
         identity(BIRTHDAY, NATION(30), BIRTHPLACE_CITY(30))
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX identity(BIRTHDAY, NATION, BIRTHPLACE_CITY) VALUES "1" : (19860413, "汉族", "aaa")
@@ -963,7 +963,7 @@ Feature: LookUpTest_Vid_String
       """
       CREATE TAG player(name string, age int);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     When executing query:
       """
       INSERT VERTEX player(name, age) VALUES 'Tim':('Tim', 20);
diff --git a/tests/tck/features/lookup/LookupEdge.feature b/tests/tck/features/lookup/LookupEdge.feature
index f4c5936285c..b4cac6c2e86 100644
--- a/tests/tck/features/lookup/LookupEdge.feature
+++ b/tests/tck/features/lookup/LookupEdge.feature
@@ -39,7 +39,7 @@ Feature: Test lookup on edge index
       CREATE EDGE INDEX e_index_1 ON lookup_edge_1(col1, col2, col3);
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     And having executed:
       """
       INSERT EDGE
@@ -86,7 +86,7 @@ Feature: Test lookup on edge index
       CREATE EDGE INDEX e_index_1 ON lookup_edge_1(col1, col2, col3);
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     And having executed:
       """
       INSERT EDGE
diff --git a/tests/tck/features/lookup/LookupEdge2.feature b/tests/tck/features/lookup/LookupEdge2.feature
index 18f1e408e7b..1e7f6a536ed 100644
--- a/tests/tck/features/lookup/LookupEdge2.feature
+++ b/tests/tck/features/lookup/LookupEdge2.feature
@@ -16,7 +16,7 @@ Feature: Test lookup on edge index 2
       CREATE EDGE INDEX e_index_1 ON lookup_edge_1(col1, col2, col3);
       CREATE EDGE INDEX e_index_3 ON lookup_edge_1(col2, col3);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     And having executed:
       """
       INSERT EDGE
diff --git a/tests/tck/features/lookup/LookupTag.feature b/tests/tck/features/lookup/LookupTag.feature
index ad4a8c43f06..c499a77b808 100644
--- a/tests/tck/features/lookup/LookupTag.feature
+++ b/tests/tck/features/lookup/LookupTag.feature
@@ -38,7 +38,7 @@ Feature: Test lookup on tag index
       CREATE TAG INDEX t_index_1 ON lookup_tag_1(col1, col2, col3);
       CREATE TAG INDEX t_index_3 ON lookup_tag_1(col2, col3);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     And having executed:
       """
       INSERT VERTEX
@@ -86,7 +86,7 @@ Feature: Test lookup on tag index
       CREATE TAG INDEX t_index_1 ON lookup_tag_1(col1, col2, col3);
       CREATE TAG INDEX t_index_3 ON lookup_tag_1(col2, col3);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     And having executed:
       """
       INSERT VERTEX
diff --git a/tests/tck/features/lookup/LookupTag2.feature b/tests/tck/features/lookup/LookupTag2.feature
index b37d83fd35c..46b594b0aa1 100644
--- a/tests/tck/features/lookup/LookupTag2.feature
+++ b/tests/tck/features/lookup/LookupTag2.feature
@@ -16,7 +16,7 @@ Feature: Test lookup on tag index 2
       CREATE TAG INDEX t_index_1 ON lookup_tag_1(col1, col2, col3);
       CREATE TAG INDEX t_index_3 ON lookup_tag_1(col2, col3);
       """
-    And wait 3 seconds
+    And wait 6 seconds
     And having executed:
       """
       INSERT VERTEX
diff --git a/tests/tck/features/match/SeekById.intVid.feature b/tests/tck/features/match/SeekById.intVid.feature
index f389214f2c0..d1d427c3229 100644
--- a/tests/tck/features/match/SeekById.intVid.feature
+++ b/tests/tck/features/match/SeekById.intVid.feature
@@ -284,7 +284,7 @@ Feature: Match seek by id
       CREATE TAG INDEX player_name_index ON player(name(10));
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX player(name, age) VALUES -100:("Tim", 32);