xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

test:delete redundant code

This commit is contained in:
lyh250-666 2024-09-07 15:36:29 +08:00
parent 256175d3bd
commit b1c08fac47
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/army/cluster/clusterBasic.py
View File

@ -63,29 +63,23 @@ class TDTestCase(TBase):
while 1: while 1:
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)
if leader_status >= 0: break 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.query("show cluster alive;")
tdSql.checkData(0, 0, leader_status) tdSql.checkData(0, 0, leader_status)
sc.dnodeStop(3) sc.dnodeStop(3)
while 1:
if clusterComCheck.checkDnodes(4): break
while 1: while 1:
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)
if leader_status >= 0: break 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.query("show cluster alive;")
tdSql.checkData(0, 0, leader_status) tdSql.checkData(0, 0, leader_status)
sc.dnodeStop(2) sc.dnodeStop(2)
# while 1:
# if clusterComCheck.checkDnodes(3): break
while 1: while 1:
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)
if leader_status >= 0: break 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.query("show cluster alive;")
tdSql.checkData(0, 0, leader_status) tdSql.checkData(0, 0, leader_status)

1
tests/army/frame/clusterCommonCheck.py
View File

@ -251,7 +251,6 @@ class ClusterComCheck:
print(tdSql.res[i]) print(tdSql.res[i])
if 'leader' in tdSql.res[i]:leader_number += 1 if 'leader' in tdSql.res[i]:leader_number += 1
elif tdSql.res[i].count('follower') + tdSql.res[i].count('candidate') >= 2: elif tdSql.res[i].count('follower') + tdSql.res[i].count('candidate') >= 2:
print(tdSql.res[i].count('follow'))
tdLog.debug("Elections not yet completed") tdLog.debug("Elections not yet completed")
return -1 return -1
else: # only one 'follower' or 'offline' else: # only one 'follower' or 'offline'