fix:mofify ci cases

tests/system-test/7-tmq/tmqCommon.py

@@ -145,29 +145,25 @@ class TMQCom:
             processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
         tdLog.debug("%s is stopped by kill -INT" % (processorName))
 
-    def getStartConsumeNotifyFromTmqsim(self,cdbName='cdb'):
+    def getStartConsumeNotifyFromTmqsim(self,cdbName='cdb',rows=1):
         loopFlag = 1
         while loopFlag:
-            tdSql.query("select * from %s.notifyinfo"%cdbName)
-            #tdLog.info("row: %d, %l64d, %l64d"%(tdSql.getData(0, 1),tdSql.getData(0, 2),tdSql.getData(0, 3))
+            tdSql.query("select * from %s.notifyinfo where cmdid = 0"%cdbName)
             actRows = tdSql.getRows()
-            for i in range(actRows):
-                if tdSql.getData(i, 1) == 0:
+            tdLog.info("row: %d"%(actRows))
+            if (actRows >= rows):
                     loopFlag = 0
-                    break
             time.sleep(0.02)
         return
 
-    def getStartCommitNotifyFromTmqsim(self,cdbName='cdb'):
+    def getStartCommitNotifyFromTmqsim(self,cdbName='cdb',rows=1):
         loopFlag = 1
         while loopFlag:
-            tdSql.query("select * from %s.notifyinfo"%cdbName)
-            #tdLog.info("row: %d, %l64d, %l64d"%(tdSql.getData(0, 1),tdSql.getData(0, 2),tdSql.getData(0, 3))
+            tdSql.query("select * from %s.notifyinfo where cmdid = 1"%cdbName)
             actRows = tdSql.getRows()
-            for i in range(actRows):
-                if tdSql.getData(i, 1) == 1:
+            tdLog.info("row: %d"%(actRows))
+            if (actRows >= rows):
                 loopFlag = 0
-                    break
             time.sleep(0.02)
         return
 

tests/system-test/7-tmq/tmqConsumerGroup.py

@@ -100,7 +100,7 @@ class TDTestCase:
 
         tdLog.info("wait consumer commit notify")
         # tmqCom.getStartCommitNotifyFromTmqsim(rows=4)
-        tmqCom.getStartConsumeNotifyFromTmqsim()
+        tmqCom.getStartConsumeNotifyFromTmqsim(rows=2)
 
         tdLog.info("pkill one consume processor")
         tmqCom.stopTmqSimProcess('tmq_sim_new')