From b1c08fac470498d88aa9feb5f8e0816373a3be7c Mon Sep 17 00:00:00 2001 From: lyh250-666 Date: Sat, 7 Sep 2024 15:36:29 +0800 Subject: [PATCH] test:delete redundant code --- tests/army/cluster/clusterBasic.py | 12 +++--------- tests/army/frame/clusterCommonCheck.py | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tests/army/cluster/clusterBasic.py b/tests/army/cluster/clusterBasic.py index 90051c24dd..b676eaf8f3 100644 --- a/tests/army/cluster/clusterBasic.py +++ b/tests/army/cluster/clusterBasic.py @@ -63,29 +63,23 @@ class TDTestCase(TBase): while 1: leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) if leader_status >= 0: break - - # leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) + leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) tdSql.query("show cluster alive;") tdSql.checkData(0, 0, leader_status) sc.dnodeStop(3) - while 1: - if clusterComCheck.checkDnodes(4): break - while 1: leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) if leader_status >= 0: break - # leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) + leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) tdSql.query("show cluster alive;") tdSql.checkData(0, 0, leader_status) sc.dnodeStop(2) - # 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 - # leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) + leader_status = clusterComCheck.check_vgroups_status_with_offline(vgroup_numbers=self.vgroupNum, db_replica=self.replicaVar) tdSql.query("show cluster alive;") tdSql.checkData(0, 0, leader_status) diff --git a/tests/army/frame/clusterCommonCheck.py b/tests/army/frame/clusterCommonCheck.py index fc978ffad2..771a51af2c 100644 --- a/tests/army/frame/clusterCommonCheck.py +++ b/tests/army/frame/clusterCommonCheck.py @@ -251,7 +251,6 @@ class ClusterComCheck: print(tdSql.res[i]) if 'leader' in tdSql.res[i]:leader_number += 1 elif tdSql.res[i].count('follower') + tdSql.res[i].count('candidate') >= 2: - print(tdSql.res[i].count('follow')) tdLog.debug("Elections not yet completed") return -1 else: # only one 'follower' or 'offline'