From b5e673f727a8b11374e594d6ffb4ac5bf3e3aad1 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Fri, 21 Feb 2025 19:05:18 +0800
Subject: [PATCH] feat:[TD-33798]modify metadata logic for tmq

---
 tests/parallel_test/cases.task       |  1 -
 tests/system-test/7-tmq/tmq_taosx.py | 48 ++++++++++++++--------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 6215d7d433..696693c051 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -470,7 +470,6 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_taosx.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_ts5466.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_td33504.py
-,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_ts-5473.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_ts5906.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/td-32187.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/td-33225.py
diff --git a/tests/system-test/7-tmq/tmq_taosx.py b/tests/system-test/7-tmq/tmq_taosx.py
index 053b29c013..845e7229a8 100644
--- a/tests/system-test/7-tmq/tmq_taosx.py
+++ b/tests/system-test/7-tmq/tmq_taosx.py
@@ -677,34 +677,34 @@ class TDTestCase:
         tdSql.execute(f'drop database d1')
 
     def run(self):
-        # self.consume_TS_5067_Test()
-        # self.consumeTest()
-        # self.consume_ts_4544()
-        # self.consume_ts_4551()
-        # self.consume_TS_4540_Test()
-        # self.consume_td_31283()
+        self.consume_TS_5067_Test()
+        self.consumeTest()
+        self.consume_ts_4544()
+        self.consume_ts_4551()
+        self.consume_TS_4540_Test()
+        self.consume_td_31283()
 
         tdSql.prepare()
         self.checkWal1VgroupOnlyMeta()
 
-        # self.checkWal1Vgroup()
-        # self.checkSnapshot1Vgroup()
-        #
-        # self.checkWal1VgroupTable()
-        # self.checkSnapshot1VgroupTable()
-        #
-        # self.checkWalMultiVgroups()
-        # self.checkWalMultiVgroupsRawData()
-        # self.checkSnapshotMultiVgroups()
-        #
-        # self.checkWalMultiVgroupsWithDropTable()
-        #
-        # self.checkSnapshotMultiVgroupsWithDropTable()
-        #
-        # self.checkSnapshot1VgroupBtmeta()
-        # self.checkSnapshot1VgroupTableBtmeta()
-        # self.checkSnapshotMultiVgroupsBtmeta()
-        # self.checkSnapshotMultiVgroupsWithDropTableBtmeta()
+        self.checkWal1Vgroup()
+        self.checkSnapshot1Vgroup()
+
+        self.checkWal1VgroupTable()
+        self.checkSnapshot1VgroupTable()
+
+        self.checkWalMultiVgroups()
+        self.checkWalMultiVgroupsRawData()
+        self.checkSnapshotMultiVgroups()
+
+        self.checkWalMultiVgroupsWithDropTable()
+
+        self.checkSnapshotMultiVgroupsWithDropTable()
+
+        self.checkSnapshot1VgroupBtmeta()
+        self.checkSnapshot1VgroupTableBtmeta()
+        self.checkSnapshotMultiVgroupsBtmeta()
+        self.checkSnapshotMultiVgroupsWithDropTableBtmeta()
 
     def stop(self):
         tdSql.close()