From 8ebe2c81c7327615925d1b88e4f4a8c445bd7021 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 24 Jun 2022 11:12:05 +0800
Subject: [PATCH] test: adjust test case

---
 ...distribute_vgroup_replica3_v1_follower.sim | 33 ++++++++++-----
 ...redistribute_vgroup_replica3_v1_leader.sim | 42 ++++++++++++++-----
 2 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim
index 788a23991a..9b11e16616 100644
--- a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim
+++ b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim
@@ -112,7 +112,7 @@ if $data(5)[4] != ready then
   goto step2
 endi
 
-print =============== step31: move follower
+print =============== step3: create database
 $leaderExist = 0
 $leaderVnode = 0
 $follower1 = 0
@@ -165,7 +165,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step32: move follower2
+print =============== step31: 
 print redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode 5 
 sql redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode 5 
 sql show d1.vgroups
@@ -178,7 +178,7 @@ endi
 
 return
 
-print =============== step33: move follower1
+print =============== step32: 
 print redistribute vgroup 2 dnode $leaderVnode dnode $follower1 dnode 5 
 sql redistribute vgroup 2 dnode $leaderVnode dnode $follower1 dnode 5 
 sql show d1.vgroups
@@ -189,7 +189,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step34: move follower2
+print =============== step33: 
 print redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower2
 sql redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower2
 sql show d1.vgroups
@@ -200,7 +200,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step35: move follower1
+print =============== step34: 
 print redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower1
 sql redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower1
 sql show d1.vgroups
@@ -211,9 +211,9 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step36: move follower2
-print redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode 5 
-sql redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode 5 
+print =============== step34: 
+print redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode $follower1
+sql redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode $follower1
 sql show d1.vgroups
 print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 
@@ -222,7 +222,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step37: move follower1
+print =============== step36: 
 print redistribute vgroup 2 dnode $leaderVnode dnode $follower1 dnode 5 
 sql redistribute vgroup 2 dnode $leaderVnode dnode $follower1 dnode 5 
 sql show d1.vgroups
@@ -233,7 +233,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step38: move follower2
+print =============== step37: 
 print redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower2
 sql redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower2
 sql show d1.vgroups
@@ -244,7 +244,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step39: move follower1
+print =============== step38: 
 print redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower1
 sql redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower1
 sql show d1.vgroups
@@ -255,6 +255,17 @@ if $rows != 1 then
   return -1
 endi
 
+print =============== step39: 
+print redistribute vgroup 2 dnode $leaderVnode dnode $follower1 dnode $follower2
+sql redistribute vgroup 2 dnode $leaderVnode dnode $follower1 dnode $follower2
+sql show d1.vgroups
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+
+sql show d1.tables
+if $rows != 1 then
+  return -1
+endi
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
diff --git a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim
index e9dd82cad9..947482b3d4 100644
--- a/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim
+++ b/tests/script/tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim
@@ -91,7 +91,7 @@ if $data(5)[4] != ready then
   goto step2
 endi
 
-print =============== step31: move follower
+print =============== step3: create database
 $leaderExist = 0
 $leaderVnode = 0
 $follower1 = 0
@@ -144,7 +144,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step32: move leader
+print =============== step40: move leader
 print redistribute vgroup 2 dnode $follower1 dnode $follower2 dnode 5 
 sql redistribute vgroup 2 dnode $follower1 dnode $follower2 dnode 5 
 sql show d1.vgroups
@@ -155,9 +155,7 @@ if $rows != 1 then
   return -1
 endi
 
-return 
-
-print =============== step33: move follower1
+print =============== step41: 
 print redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode 5 
 sql redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode 5 
 sql show d1.vgroups
@@ -168,7 +166,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step34: move follower2
+print =============== step42: 
 print redistribute vgroup 2 dnode $follower1 dnode 5 dnode $leaderVnode
 sql redistribute vgroup 2 dnode $follower1 dnode 5 dnode $leaderVnode
 sql show d1.vgroups
@@ -179,7 +177,18 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step35: move leader
+print =============== step43:
+print redistribute vgroup 2 dnode $follower1 dnode $follower2 dnode $leaderVnode
+sql redistribute vgroup 2 dnode $follower1 dnode $follower2 dnode $leaderVnode
+sql show d1.vgroups
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+
+sql show d1.tables
+if $rows != 1 then
+  return -1
+endi
+
+print =============== step44:
 print redistribute vgroup 2 dnode $follower2 dnode 5 dnode $follower1
 sql redistribute vgroup 2 dnode $follower2 dnode 5 dnode $follower1
 sql show d1.vgroups
@@ -190,7 +199,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step36: move follower1
+print =============== step45:
 print redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode 5 
 sql redistribute vgroup 2 dnode $leaderVnode dnode $follower2 dnode 5 
 sql show d1.vgroups
@@ -201,7 +210,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step37: move follower2
+print =============== step46: 
 print redistribute vgroup 2 dnode $leaderVnode dnode $follower1 dnode 5 
 sql redistribute vgroup 2 dnode $leaderVnode dnode $follower1 dnode 5 
 sql show d1.vgroups
@@ -212,7 +221,7 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step38: move leader
+print =============== step47: 
 print redistribute vgroup 2 dnode $follower1 dnode 5 dnode $follower2
 sql redistribute vgroup 2 dnode $follower1 dnode 5 dnode $follower2
 sql show d1.vgroups
@@ -223,7 +232,18 @@ if $rows != 1 then
   return -1
 endi
 
-print =============== step39: move follower1
+print =============== step48: 
+print redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower2
+sql redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower2
+sql show d1.vgroups
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+
+sql show d1.tables
+if $rows != 1 then
+  return -1
+endi
+
+print =============== step49: 
 print redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower2
 sql redistribute vgroup 2 dnode $leaderVnode dnode 5 dnode $follower2
 sql show d1.vgroups
-- 
GitLab