From 5d507aea31029f42c5f0ec818b9e0d9867fab9cb Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 26 Jul 2022 18:30:52 +0800
Subject: [PATCH] test: adjust case for db option

---
 tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim   | 2 +-
 tests/script/tsim/sync/threeReplica1VgElect.sim           | 2 +-
 tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim | 2 +-
 tests/script/tsim/tmq/prepareBasicEnv-1vgrp.sim           | 2 +-
 tests/script/tsim/tmq/prepareBasicEnv-4vgrp.sim           | 2 +-
 tests/script/tsim/tmq/topic.sim                           | 2 +-
 tests/system-test/0-others/cachemodel.py                  | 2 +-
 tests/system-test/0-others/fsync.py                       | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim b/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim
index aff458c02a..d2b5565308 100644
--- a/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim
+++ b/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim
@@ -66,7 +66,7 @@ print $data(db)[13] $data(db)[14] $data(db)[15] $data(db)[16] $data(db)[17] $dat
 if $rows != 3 then
   return -1
 endi
-if $data(db)[19] != ready then
+if $data(db)[15] != ready then
   goto check_db_ready
 endi
 
diff --git a/tests/script/tsim/sync/threeReplica1VgElect.sim b/tests/script/tsim/sync/threeReplica1VgElect.sim
index bf2cb05570..7a4fa1c2a6 100644
--- a/tests/script/tsim/sync/threeReplica1VgElect.sim
+++ b/tests/script/tsim/sync/threeReplica1VgElect.sim
@@ -66,7 +66,7 @@ print $data(db)[13] $data(db)[14] $data(db)[15] $data(db)[16] $data(db)[17] $dat
 if $rows != 3 then
   return -1
 endi
-if $data(db)[19] != ready then
+if $data(db)[15] != ready then
   goto check_db_ready
 endi
 
diff --git a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
index a6a0dda8a7..967b3f1406 100644
--- a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
+++ b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
@@ -66,7 +66,7 @@ print $data(db)[13] $data(db)[14] $data(db)[15] $data(db)[16] $data(db)[17] $dat
 if $rows != 3 then
   return -1
 endi
-if $data(db)[19] != ready then
+if $data(db)[15] != ready then
   goto check_db_ready
 endi
 
diff --git a/tests/script/tsim/tmq/prepareBasicEnv-1vgrp.sim b/tests/script/tsim/tmq/prepareBasicEnv-1vgrp.sim
index 43b93b7372..4630e295a9 100644
--- a/tests/script/tsim/tmq/prepareBasicEnv-1vgrp.sim
+++ b/tests/script/tsim/tmq/prepareBasicEnv-1vgrp.sim
@@ -39,7 +39,7 @@ sql show databases
 print ==> rows: $rows
 print ==> $data(db)[0] $data(db)[1] $data(db)[2] $data(db)[3] $data(db)[4] $data(db)[5] $data(db)[6] $data(db)[7] $data(db)[8] $data(db)[9] $data(db)[10] $data(db)[11] $data(db)[12]
 print     $data(db)[13] $data(db)[14] $data(db)[15] $data(db)[16] $data(db)[17] $data(db)[18] $data(db)[19] $data(db)[20]
-if $data(db)[19] != ready then
+if $data(db)[15] != ready then
   sleep 100
   $loop_cnt = $loop_cnt + 1
   goto check_db_ready  
diff --git a/tests/script/tsim/tmq/prepareBasicEnv-4vgrp.sim b/tests/script/tsim/tmq/prepareBasicEnv-4vgrp.sim
index 5e81137ffa..bce2292f97 100644
--- a/tests/script/tsim/tmq/prepareBasicEnv-4vgrp.sim
+++ b/tests/script/tsim/tmq/prepareBasicEnv-4vgrp.sim
@@ -39,7 +39,7 @@ sql show databases
 print ==> rows: $rows
 print ==> $data(db)[0] $data(db)[1] $data(db)[2] $data(db)[3] $data(db)[4] $data(db)[5] $data(db)[6] $data(db)[7] $data(db)[8] $data(db)[9] $data(db)[10] $data(db)[11] $data(db)[12]
 print     $data(db)[13] $data(db)[14] $data(db)[15] $data(db)[16] $data(db)[17] $data(db)[18] $data(db)[19] $data(db)[20]
-if $data(db)[19] != ready then
+if $data(db)[15] != ready then
   sleep 100
   $loop_cnt = $loop_cnt + 1
   goto check_db_ready  
diff --git a/tests/script/tsim/tmq/topic.sim b/tests/script/tsim/tmq/topic.sim
index 9add349a18..33a5b861b6 100644
--- a/tests/script/tsim/tmq/topic.sim
+++ b/tests/script/tsim/tmq/topic.sim
@@ -31,7 +31,7 @@ sql show databases
 print ==> rows: $rows
 print ==> $data(db)[0] $data(db)[1] $data(db)[2] $data(db)[3] $data(db)[4] $data(db)[5] $data(db)[6] $data(db)[7] $data(db)[8] $data(db)[9] $data(db)[10] $data(db)[11] $data(db)[12]
 print     $data(db)[13] $data(db)[14] $data(db)[15] $data(db)[16] $data(db)[17] $data(db)[18] $data(db)[19] $data(db)[20]
-if $data(db)[19] != ready then
+if $data(db)[15] != ready then
   sleep 100
   $loop_cnt = $loop_cnt + 1
   goto check_db_ready  
diff --git a/tests/system-test/0-others/cachemodel.py b/tests/system-test/0-others/cachemodel.py
index 09538e6678..102a34612d 100644
--- a/tests/system-test/0-others/cachemodel.py
+++ b/tests/system-test/0-others/cachemodel.py
@@ -90,7 +90,7 @@ class TDTestCase:
         for db_info in databases_infos:
             dbname = db_info[0]
             # print(dbname)
-            cache_last_value = db_info[16]
+            cache_last_value = db_info[18]
             # print(cache_last_value)
             if dbname in ["information_schema" , "performance_schema"]:
                 continue
diff --git a/tests/system-test/0-others/fsync.py b/tests/system-test/0-others/fsync.py
index 964550cdbc..eedf3629ed 100644
--- a/tests/system-test/0-others/fsync.py
+++ b/tests/system-test/0-others/fsync.py
@@ -43,9 +43,9 @@ class TDTestCase:
         fsync_index = 0
         tdSql.query("show databases")
         for i in range(tdSql.queryCols):
-            if tdSql.cursor.description[i][0] == "wal":
+            if tdSql.cursor.description[i][0] == "wal_level":
                 wal_index = i
-            if tdSql.cursor.description[i][0] == "fsync":
+            if tdSql.cursor.description[i][0] == "wal_fsync_period":
                 fsync_index = i
 
         tdSql.execute("drop database if exists db1")