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

fix: show variables rows check

This commit is contained in:
facetosea 2025-03-07 09:51:05 +08:00
parent 2e64d8578e
commit c27662cf09
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/pytest/util/sql.py
View File

@ -704,6 +704,17 @@ class TDSql:
tdLog.info("sql:%s, elm:%s == expect_elm:%s" % (self.sql, elm, expect_elm)) tdLog.info("sql:%s, elm:%s == expect_elm:%s" % (self.sql, elm, expect_elm))
return True return True
self.print_error_frame_info(elm, expect_elm) self.print_error_frame_info(elm, expect_elm)
def checkGreater(self, elm, expect_elm):
if elm > expect_elm:
tdLog.info("sql:%s, elm:%s > expect_elm:%s" % (self.sql, elm, expect_elm))
return True
else:
caller = inspect.getframeinfo(inspect.stack()[1][0])
args = (caller.filename, caller.lineno, self.sql, elm, expect_elm)
tdLog.info("%s(%d) failed: sql:%s, elm:%s <= expect_elm:%s" % args)
self.print_error_frame_info(elm, expect_elm)
return False
def checkNotEqual(self, elm, expect_elm): def checkNotEqual(self, elm, expect_elm):
if elm != expect_elm: if elm != expect_elm:

8
tests/system-test/2-query/db.py
View File

@ -46,8 +46,8 @@ class TDTestCase:
tdSql.checkRows(2) tdSql.checkRows(2)
def case2(self): def case2(self):
tdSql.query("show variables") tdSql.query("show variables")
tdSql.checkRows(87) tdSql.checkGreater(tdSql.getRows(), 80)
for i in range(self.replicaVar): for i in range(self.replicaVar):
tdSql.query("show dnode %d variables like 'debugFlag'" % (i + 1)) tdSql.query("show dnode %d variables like 'debugFlag'" % (i + 1))
@ -88,7 +88,7 @@ class TDTestCase:
def show_local_variables_like(self): def show_local_variables_like(self):
tdSql.query("show local variables") tdSql.query("show local variables")
tdSql.checkRows(85) tdSql.checkGreater(tdSql.getRows(), 80)
tdSql.query("show local variables like 'debugFlag'") tdSql.query("show local variables like 'debugFlag'")
tdSql.checkRows(1) tdSql.checkRows(1)
@ -116,7 +116,7 @@ class TDTestCase:
for zone in zones: for zone in zones:
tdLog.info(f"show {zone} variables") tdLog.info(f"show {zone} variables")
tdSql.query(f"show {zone} variables") tdSql.query(f"show {zone} variables")
tdSql.checkRows(87) tdSql.checkGreater(tdSql.getRows(), 80)
tdLog.info(f"show {zone} variables like 'debugFlag'") tdLog.info(f"show {zone} variables like 'debugFlag'")
#tdSql.query(f"show {zone} variables like 'debugFlag'") #tdSql.query(f"show {zone} variables like 'debugFlag'")