From 256175d3bd34aa86a536ae8713f050dd36a7b141 Mon Sep 17 00:00:00 2001
From: lyh250-666 <lyh666@bupt.edu.cn>
Date: Sat, 7 Sep 2024 14:59:01 +0800
Subject: [PATCH] test:modify dnodes = 5

---
 tests/army/cluster/clusterBasic.py | 18 ++++++++++--------
 tests/parallel_test/cases.task     |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/army/cluster/clusterBasic.py b/tests/army/cluster/clusterBasic.py
index 5b808da129..90051c24dd 100644
--- a/tests/army/cluster/clusterBasic.py
+++ b/tests/army/cluster/clusterBasic.py
@@ -36,19 +36,19 @@ class TDTestCase(TBase):
 
     def checkClusterEmptyDB(self):
         while 1:
-            if clusterComCheck.checkDnodes(3): break
+            if clusterComCheck.checkDnodes(5): break
         tdSql.query("show cluster alive;")
         tdSql.checkData(0, 0, 1)
 
         sc.dnodeStop(3)
         while 1:
-            if clusterComCheck.checkDnodes(2): break
+            if clusterComCheck.checkDnodes(4): break
         tdSql.query("show cluster alive;")
         tdSql.checkData(0, 0, 1)
 
         sc.dnodeStop(2)
         while 1:
-            if clusterComCheck.checkDnodes(1): break
+            if clusterComCheck.checkDnodes(3): break
         tdSql.query("show cluster alive;")
         tdSql.checkData(0, 0, 1)
 
@@ -56,8 +56,8 @@ class TDTestCase(TBase):
         sc.dnodeStart(3)
         sc.dnodeStart(2)
         while 1:
-            if clusterComCheck.checkDnodes(3): break
-            
+            if clusterComCheck.checkDnodes(5): break
+        
         tdSql.execute(f'drop database if exists {self.db}')
         tdSql.execute(f'create database {self.db} replica {self.replicaVar} vgroups {self.vgroupNum}')
         while 1:
@@ -70,7 +70,7 @@ class TDTestCase(TBase):
 
         sc.dnodeStop(3)
         while 1:
-            if clusterComCheck.checkDnodes(2): break
+            if clusterComCheck.checkDnodes(4): break
             
         while 1:
             leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar)
@@ -80,8 +80,8 @@ class TDTestCase(TBase):
         tdSql.checkData(0, 0, leader_status)
         
         sc.dnodeStop(2)
-        while 1:
-            if clusterComCheck.checkDnodes(1): break
+        # while 1:
+        #     if clusterComCheck.checkDnodes(3): break
         while 1:
             leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar)
             if leader_status >= 0: break
@@ -97,6 +97,8 @@ class TDTestCase(TBase):
 
     def stop(self):
         sc.dnodeStop(1)
+        sc.dnodeStop(4)
+        sc.dnodeStop(5)
         tdSql.close()
         tdLog.success(f"{__file__} successfully executed")
 
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 99d749a977..c8e0a624d5 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -24,7 +24,7 @@
 ,,y,army,./pytest.sh python3 ./test.py -f query/fill/fill_desc.py -N 3 -L 3 -D 2
 ,,y,army,./pytest.sh python3 ./test.py -f query/fill/fill_null.py
 ,,y,army,./pytest.sh python3 ./test.py -f cluster/incSnapshot.py -N 3
-,,y,army,./pytest.sh python3 ./test.py -f cluster/clusterBasic.py -N 3
+,,y,army,./pytest.sh python3 ./test.py -f cluster/clusterBasic.py -N 5
 ,,y,army,./pytest.sh python3 ./test.py -f query/query_basic.py -N 3
 ,,y,army,./pytest.sh python3 ./test.py -f query/accuracy/test_query_accuracy.py
 ,,y,army,./pytest.sh python3 ./test.py -f insert/insert_basic.py -N 3