From 9560f319b24021769c0c569786c22134f22433ce Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 25 May 2020 16:12:49 +0800 Subject: [PATCH] add insert/sparseData.py to test compressing sparse file content. [TD-412] --- tests/pytest/insert/randomNullCommit.py | 14 +- tests/pytest/insert/sparseData.py | 67 ++++ tests/pytest/random-test/random-test.py | 1 + tests/pytest/table/boundary.py | 8 +- tests/pytest/tag_lite/3.py | 206 +++++------ tests/pytest/tag_lite/4.py | 290 ++++++++-------- tests/pytest/tag_lite/5.py | 342 +++++++++--------- tests/pytest/tag_lite/6.py | 410 +++++++++++----------- tests/pytest/tag_lite/add.py | 292 ++++++++-------- tests/pytest/tag_lite/bigint.py | 86 ++--- tests/pytest/tag_lite/binary.py | 86 ++--- tests/pytest/tag_lite/binary_binary.py | 114 +++--- tests/pytest/tag_lite/bool.py | 84 ++--- tests/pytest/tag_lite/bool_binary.py | 114 +++--- tests/pytest/tag_lite/bool_int.py | 122 +++---- tests/pytest/tag_lite/change.py | 194 +++++------ tests/pytest/tag_lite/column.py | 10 +- tests/pytest/tag_lite/commit.py | 444 ++++++++++++------------ tests/pytest/tag_lite/create.py | 182 +++++----- tests/pytest/tag_lite/delete.py | 286 +++++++-------- tests/pytest/tag_lite/double.py | 86 ++--- tests/pytest/tag_lite/filter.py | 18 +- tests/pytest/tag_lite/float.py | 86 ++--- tests/pytest/tag_lite/int.py | 86 ++--- tests/pytest/tag_lite/int_binary.py | 114 +++--- tests/pytest/tag_lite/int_float.py | 122 +++---- tests/pytest/tag_lite/set.py | 204 +++++------ tests/pytest/tag_lite/smallint.py | 86 ++--- tests/pytest/tag_lite/tinyint.py | 86 ++--- tests/pytest/util/dnodes.py | 17 + 30 files changed, 2174 insertions(+), 2083 deletions(-) create mode 100644 tests/pytest/insert/sparseData.py diff --git a/tests/pytest/insert/randomNullCommit.py b/tests/pytest/insert/randomNullCommit.py index f90bb9b3e5..ecacd20daf 100644 --- a/tests/pytest/insert/randomNullCommit.py +++ b/tests/pytest/insert/randomNullCommit.py @@ -29,7 +29,8 @@ class TDTestCase: tdSql.prepare() tdLog.info("=============== step1") - tdSql.execute('create table tb (ts timestamp, speed int, temp float, note binary(5), flag bool)') + tdSql.execute( + 'create table tb (ts timestamp, speed int, temp float, note binary(5), flag bool)') numOfRecords = 0 randomList = [10, 50, 100, 500, 1000, 5000] @@ -38,23 +39,24 @@ class TDTestCase: tdLog.info("will insert %d records" % num) for x in range(0, num): tdLog.info( - 'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' % x) + 'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' % + x) tdSql.execute( - 'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' % x) + 'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' % + x) numOfRecords = numOfRecords + num tdSql.query("select * from tb") tdSql.checkRows(numOfRecords) - tdSql.checkData(numOfRecords-num, 1, None) - tdSql.checkData(numOfRecords-1, 2, None) + tdSql.checkData(numOfRecords - num, 1, None) + tdSql.checkData(numOfRecords - 1, 2, None) tdLog.info("stop dnode to commit data to disk") tdDnodes.stop(1) tdDnodes.start(1) tdLog.sleep(5) - def stop(self): tdSql.close() tdLog.success("%s successfully executed" % __file__) diff --git a/tests/pytest/insert/sparseData.py b/tests/pytest/insert/sparseData.py new file mode 100644 index 0000000000..38b04b339e --- /dev/null +++ b/tests/pytest/insert/sparseData.py @@ -0,0 +1,67 @@ +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + +import sys + +from util.log import * +from util.cases import * +from util.sql import * +from util.dnodes import * + + +class TDTestCase: + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + def run(self): + tdSql.prepare() + + tdLog.info("=============== step1") + tdSql.execute( + 'create table tb (ts timestamp, speed int, temp float, note binary(4000), flag bool)') + + numOfRecords = 1000000 + dividend = 1000 + tdLog.info("will insert %d records" % numOfRecords) + + ts = 1500000000000 + for i in range(0, numOfRecords): + + if (i % dividend): + print(".", end="") + tdSql.execute( + 'insert into tb values (%d + %da, NULL, NULL, NULL, TRUE)' % + (ts, i)) + else: + print("a", end="") + tdSql.execute( + 'insert into tb values (%d + %da, NULL, NULL, "a", FALSE)' % + (ts, i)) + + tdSql.query("select * from tb") + tdSql.checkRows(numOfRecords) + tdSql.checkData(numOfRecords - dividend, 3, 'a') + tdSql.checkData(numOfRecords - dividend - 1, 3, None) + + tdLog.info("stop dnode to commit data to disk") + tdDnodes.stop(1) + tdLog.info("dnodes:%d size is %d" % (1, tdDnodes.getDataSize(1))) + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/random-test/random-test.py b/tests/pytest/random-test/random-test.py index 4e1e6ac2fa..596f33264f 100644 --- a/tests/pytest/random-test/random-test.py +++ b/tests/pytest/random-test/random-test.py @@ -121,6 +121,7 @@ class Test: tdDnodes.start(1) tdSql.prepare() + class TDTestCase: def init(self, conn, logSql): tdLog.debug("start to execute %s" % __file__) diff --git a/tests/pytest/table/boundary.py b/tests/pytest/table/boundary.py index 29fdd5c475..bb5e187f0d 100644 --- a/tests/pytest/table/boundary.py +++ b/tests/pytest/table/boundary.py @@ -98,12 +98,16 @@ class TDTestCase: # create a super table with name exceed max length sname = self.generateString(maxTableNameLen + 1) tdLog.info("create a super table with length %d" % len(sname)) - tdSql.error("create table %s (ts timestamp, value int) tags(id int)" % sname) + tdSql.error( + "create table %s (ts timestamp, value int) tags(id int)" % + sname) # create a super table with name of max length sname = self.generateString(maxTableNameLen) tdLog.info("create a super table with length %d" % len(sname)) - tdSql.execute("create table %s (ts timestamp, value int) tags(id int)" % sname) + tdSql.execute( + "create table %s (ts timestamp, value int) tags(id int)" % + sname) tdLog.info("check table count, should be one") tdSql.query('show stables') tdSql.checkRows(1) diff --git a/tests/pytest/tag_lite/3.py b/tests/pytest/tag_lite/3.py index 68d2e6c5ba..373db1c70f 100644 --- a/tests/pytest/tag_lite/3.py +++ b/tests/pytest/tag_lite/3.py @@ -69,9 +69,9 @@ class TDTestCase: "insert into %s values (now + %s, %d)" % (tb, ms, x)) x = x + 1 - #TSIM: endw + # TSIM: endw i = i + 1 - #TSIM: endw + # TSIM: endw while (i < 10): tb = "%s%d" % (tbPrefix, i) # TSIM: sql create table $tb using %s tags( 1, 1, 1 ) @@ -89,9 +89,9 @@ class TDTestCase: "insert into %s values (now + %s, %d)" % (tb, ms, x)) x = x + 1 - #TSIM: endw + # TSIM: endw i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -102,7 +102,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(%d)' % totalNum) tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from %s where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % mt) @@ -111,7 +111,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % mt) tdSql.query('select * from %s where ts > now + 4m' % mt) @@ -119,7 +119,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % mt) tdSql.query('select * from %s where ts = now + 4m' % mt) @@ -127,7 +127,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -138,7 +138,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -149,14 +149,14 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % mt) tdSql.query('select * from %s where tgcol1 <> 0' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % mt) tdSql.query('select * from %s where tgcol1 = 1' % mt) @@ -164,35 +164,35 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % mt) tdSql.query('select * from %s where tgcol1 <> 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = true tdLog.info('select * from %s where tgcol1 = true' % mt) tdSql.query('select * from %s where tgcol1 = true' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> true tdLog.info('select * from %s where tgcol1 <> true' % mt) tdSql.query('select * from %s where tgcol1 <> true' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = false tdLog.info('select * from %s where tgcol1 = false' % mt) tdSql.query('select * from %s where tgcol1 = false' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> false tdLog.info('select * from %s where tgcol1 <> false' % mt) tdSql.query('select * from %s where tgcol1 <> false' % mt) @@ -200,7 +200,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -210,28 +210,28 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % mt) tdSql.query('select * from %s where tgcol2 <> 0' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % mt) tdSql.query('select * from %s where tgcol2 = 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % mt) tdSql.query('select * from %s where tgcol2 <> 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -242,28 +242,28 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 <> 0 tdLog.info('select * from %s where tgcol3 <> 0' % mt) tdSql.query('select * from %s where tgcol3 <> 0' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 = 1 tdLog.info('select * from %s where tgcol3 = 1' % mt) tdSql.query('select * from %s where tgcol3 = 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 <> 1 tdLog.info('select * from %s where tgcol3 <> 1' % mt) tdSql.query('select * from %s where tgcol3 <> 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -277,7 +277,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> true tdLog.info( 'select * from %s where ts > now + 4m and tgcol1 <> true' % @@ -288,7 +288,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = false tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 = false' % @@ -299,7 +299,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> false tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 <> false' % @@ -310,7 +310,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 = false' % @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 <> false' % @@ -332,7 +332,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol1 <> false tdLog.info( @@ -344,7 +344,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> false # and ts < now + 5m tdLog.info( @@ -357,7 +357,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -368,7 +368,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol2 <> 1' % mt) tdSql.query( @@ -378,7 +378,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol2 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol2 = 0' % mt) @@ -386,7 +386,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol2 <> 0' % mt) tdSql.query( @@ -396,7 +396,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol2 = 0' % mt) tdSql.query( @@ -406,7 +406,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -418,7 +418,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -431,7 +431,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts # < now + 5m tdLog.info( @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -455,7 +455,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol3 <> 1' % mt) tdSql.query( @@ -465,7 +465,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol3 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol3 = 0' % mt) @@ -473,7 +473,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol3 <> 0' % mt) tdSql.query( @@ -483,7 +483,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol3 = 0' % mt) tdSql.query( @@ -493,7 +493,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 <> 0' % @@ -505,7 +505,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 tdLog.info( @@ -518,7 +518,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m tdLog.info( @@ -531,7 +531,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -547,7 +547,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 and # tgcol1 <> true tdLog.info( @@ -560,7 +560,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 and # tgcol1 = false tdLog.info( @@ -573,7 +573,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 and # tgcol1 <> false tdLog.info( @@ -586,7 +586,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 and # tgcol1 = false tdLog.info( @@ -599,7 +599,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 and # tgcol1 <> false tdLog.info( @@ -612,7 +612,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol1 <> false tdLog.info( @@ -625,7 +625,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol1 <> false tdLog.info( @@ -638,7 +638,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -654,7 +654,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol1 <> true tdLog.info( @@ -667,7 +667,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol1 = false tdLog.info( @@ -680,7 +680,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol1 <> false tdLog.info( @@ -693,7 +693,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol1 = false tdLog.info( @@ -706,7 +706,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol1 <> false tdLog.info( @@ -719,7 +719,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol1 <> false tdLog.info( @@ -732,7 +732,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol1 <> false tdLog.info( @@ -745,7 +745,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -761,7 +761,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol2 <> 1 tdLog.info( @@ -774,7 +774,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -787,7 +787,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -800,7 +800,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -813,7 +813,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -826,7 +826,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol2 <> 0 tdLog.info( @@ -839,7 +839,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 tdLog.info( @@ -852,7 +852,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -868,7 +868,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -881,7 +881,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -894,7 +894,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -907,7 +907,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -920,7 +920,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -933,7 +933,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -946,7 +946,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -959,7 +959,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -977,7 +977,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -995,7 +995,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1012,7 +1012,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1029,7 +1029,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -1047,7 +1047,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1064,7 +1064,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1081,7 +1081,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1096,7 +1096,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -1114,7 +1114,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2 @@ -1130,7 +1130,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3 @@ -1146,7 +1146,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -1165,7 +1165,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1182,7 +1182,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1199,7 +1199,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -1218,7 +1218,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1235,7 +1235,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1250,7 +1250,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1263,7 +1263,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -1278,7 +1278,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1291,7 +1291,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1304,7 +1304,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -1318,7 +1318,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/4.py b/tests/pytest/tag_lite/4.py index 66641f9dfe..aae930ecdf 100644 --- a/tests/pytest/tag_lite/4.py +++ b/tests/pytest/tag_lite/4.py @@ -73,9 +73,9 @@ class TDTestCase: "insert into %s values (now + %s, %d)" % (tb, ms, x)) x = x + 1 - #TSIM: endw + # TSIM: endw i = i + 1 - #TSIM: endw + # TSIM: endw while (i < 10): tb = "%s%d" % (tbPrefix, i) # TSIM: sql create table $tb using %s tags( 1, 1, 1, 1 ) @@ -96,9 +96,9 @@ class TDTestCase: "insert into %s values (now + %s, %d)" % (tb, ms, x)) x = x + 1 - #TSIM: endw + # TSIM: endw i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -109,7 +109,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from %s where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % mt) @@ -118,7 +118,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % mt) tdSql.query('select * from %s where ts > now + 4m' % mt) @@ -126,7 +126,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % mt) tdSql.query('select * from %s where ts = now + 4m' % mt) @@ -134,7 +134,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -146,7 +146,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -157,7 +157,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % mt) tdSql.query('select * from %s where tgcol1 <> 0' % mt) @@ -165,7 +165,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % mt) tdSql.query('select * from %s where tgcol1 = 1' % mt) @@ -173,7 +173,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % mt) tdSql.query('select * from %s where tgcol1 <> 1' % mt) @@ -181,7 +181,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % mt) tdSql.query('select * from %s where tgcol1 = 1' % mt) @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % mt) tdSql.query('select * from %s where tgcol1 <> 1' % mt) @@ -197,7 +197,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = 0 tdLog.info('select * from %s where tgcol1 = 0' % mt) tdSql.query('select * from %s where tgcol1 = 0' % mt) @@ -205,7 +205,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % mt) tdSql.query('select * from %s where tgcol1 <> 0' % mt) @@ -213,7 +213,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -224,7 +224,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % mt) tdSql.query('select * from %s where tgcol2 <> 0' % mt) @@ -232,7 +232,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % mt) tdSql.query('select * from %s where tgcol2 = 1' % mt) @@ -240,7 +240,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % mt) tdSql.query('select * from %s where tgcol2 <> 1' % mt) @@ -248,7 +248,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -259,7 +259,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 <> 0 tdLog.info('select * from %s where tgcol3 <> 0' % mt) tdSql.query('select * from %s where tgcol3 <> 0' % mt) @@ -267,7 +267,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 = 1 tdLog.info('select * from %s where tgcol3 = 1' % mt) tdSql.query('select * from %s where tgcol3 = 1' % mt) @@ -275,7 +275,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 <> 1 tdLog.info('select * from %s where tgcol3 <> 1' % mt) tdSql.query('select * from %s where tgcol3 <> 1' % mt) @@ -283,7 +283,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -294,7 +294,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol4 <> 0 tdLog.info('select * from %s where tgcol4 <> 0' % mt) tdSql.query('select * from %s where tgcol4 <> 0' % mt) @@ -302,7 +302,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % mt) tdSql.query('select * from %s where tgcol4 = 1' % mt) @@ -310,7 +310,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol4 <> 1 tdLog.info('select * from %s where tgcol4 <> 1' % mt) tdSql.query('select * from %s where tgcol4 <> 1' % mt) @@ -318,7 +318,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol1 <> 1' % mt) tdSql.query( @@ -339,7 +339,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol1 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol1 = 0' % mt) @@ -347,7 +347,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol1 <> 0' % mt) tdSql.query( @@ -357,7 +357,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol1 = 0' % mt) tdSql.query( @@ -367,7 +367,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 <> 0' % @@ -379,7 +379,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 tdLog.info( @@ -392,7 +392,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts # < now + 5m tdLog.info( @@ -405,7 +405,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -416,7 +416,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol2 <> 1' % mt) tdSql.query( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol2 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol2 = 0' % mt) @@ -434,7 +434,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol2 <> 0' % mt) tdSql.query( @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol2 = 0' % mt) tdSql.query( @@ -454,7 +454,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -466,7 +466,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -479,7 +479,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts # < now + 5m tdLog.info( @@ -492,7 +492,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -503,7 +503,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol3 <> 1' % mt) tdSql.query( @@ -513,7 +513,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol3 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol3 = 0' % mt) @@ -521,7 +521,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol3 <> 0' % mt) tdSql.query( @@ -531,7 +531,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol3 = 0' % mt) tdSql.query( @@ -541,7 +541,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 <> 0' % @@ -553,7 +553,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 tdLog.info( @@ -566,7 +566,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m tdLog.info( @@ -579,7 +579,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -590,7 +590,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol4 <> 1' % mt) tdSql.query( @@ -600,7 +600,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol4 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol4 = 0' % mt) @@ -608,7 +608,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol4 <> 0' % mt) tdSql.query( @@ -618,7 +618,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol4 = 0' % mt) tdSql.query( @@ -628,7 +628,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 <> 0' % @@ -640,7 +640,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 tdLog.info( @@ -653,7 +653,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts # < now + 5m tdLog.info( @@ -666,7 +666,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -682,7 +682,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 and # tgcol1 <> 1 tdLog.info( @@ -695,7 +695,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -708,7 +708,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -721,7 +721,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -734,7 +734,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -747,7 +747,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol1 <> 0 tdLog.info( @@ -760,7 +760,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol1 <> 0 tdLog.info( @@ -773,7 +773,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -789,7 +789,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol1 <> 1 tdLog.info( @@ -802,7 +802,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol1 = 0 tdLog.info( @@ -815,7 +815,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -828,7 +828,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol1 = 0 tdLog.info( @@ -841,7 +841,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -854,7 +854,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -867,7 +867,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol1 <> 0 tdLog.info( @@ -880,7 +880,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -896,7 +896,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol2 <> 1 tdLog.info( @@ -909,7 +909,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -922,7 +922,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -935,7 +935,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -948,7 +948,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -961,7 +961,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol2 <> 0 tdLog.info( @@ -974,7 +974,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 tdLog.info( @@ -987,7 +987,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -1003,7 +1003,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1016,7 +1016,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1029,7 +1029,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1042,7 +1042,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1055,7 +1055,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1068,7 +1068,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1081,7 +1081,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1094,7 +1094,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -1110,7 +1110,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1123,7 +1123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1136,7 +1136,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1149,7 +1149,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1162,7 +1162,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1175,7 +1175,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1188,7 +1188,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1201,7 +1201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -1217,7 +1217,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1230,7 +1230,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1243,7 +1243,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1256,7 +1256,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1269,7 +1269,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1282,7 +1282,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1295,7 +1295,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1308,7 +1308,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -1324,7 +1324,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 tdLog.info( @@ -1337,7 +1337,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1350,7 +1350,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1363,7 +1363,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1376,7 +1376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1389,7 +1389,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1402,7 +1402,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 @@ -1416,7 +1416,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -1434,7 +1434,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -1452,7 +1452,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1469,7 +1469,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1486,7 +1486,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1503,7 +1503,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step20 tdLog.info('=============== step20') @@ -1521,7 +1521,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1538,7 +1538,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1555,7 +1555,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1572,7 +1572,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1585,7 +1585,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step21 tdLog.info('=============== step21') @@ -1603,7 +1603,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2 @@ -1619,7 +1619,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3 @@ -1635,7 +1635,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol4 @@ -1651,7 +1651,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step22 tdLog.info('=============== step22') @@ -1670,7 +1670,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1687,7 +1687,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1704,7 +1704,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1717,7 +1717,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step23 tdLog.info('=============== step23') @@ -1736,7 +1736,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1753,7 +1753,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1768,7 +1768,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1781,7 +1781,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1795,7 +1795,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step24 tdLog.info('=============== step24') @@ -1810,7 +1810,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1823,7 +1823,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1836,7 +1836,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1849,7 +1849,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -1863,7 +1863,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/5.py b/tests/pytest/tag_lite/5.py index 6e94e692cd..b3608bebee 100644 --- a/tests/pytest/tag_lite/5.py +++ b/tests/pytest/tag_lite/5.py @@ -86,10 +86,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): tb = "%s%d" % (tbPrefix, i) @@ -115,10 +115,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -129,7 +129,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -138,7 +138,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -146,7 +146,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -154,7 +154,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -166,7 +166,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -177,7 +177,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % (mt)) tdSql.query('select * from %s where tgcol1 <> 0' % (mt)) @@ -185,7 +185,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % (mt)) tdSql.query('select * from %s where tgcol1 = 1' % (mt)) @@ -193,7 +193,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % (mt)) tdSql.query('select * from %s where tgcol1 <> 1' % (mt)) @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % (mt)) tdSql.query('select * from %s where tgcol1 = 1' % (mt)) @@ -209,7 +209,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % (mt)) tdSql.query('select * from %s where tgcol1 <> 1' % (mt)) @@ -217,7 +217,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 0 tdLog.info('select * from %s where tgcol1 = 0' % (mt)) tdSql.query('select * from %s where tgcol1 = 0' % (mt)) @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % (mt)) tdSql.query('select * from %s where tgcol1 <> 0' % (mt)) @@ -233,7 +233,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -244,7 +244,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % (mt)) tdSql.query('select * from %s where tgcol2 <> 0' % (mt)) @@ -252,7 +252,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % (mt)) tdSql.query('select * from %s where tgcol2 = 1' % (mt)) @@ -260,7 +260,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -268,7 +268,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -279,7 +279,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 <> 0 tdLog.info('select * from %s where tgcol3 <> 0' % (mt)) tdSql.query('select * from %s where tgcol3 <> 0' % (mt)) @@ -287,7 +287,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 1 tdLog.info('select * from %s where tgcol3 = 1' % (mt)) tdSql.query('select * from %s where tgcol3 = 1' % (mt)) @@ -295,7 +295,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 <> 1 tdLog.info('select * from %s where tgcol3 <> 1' % (mt)) tdSql.query('select * from %s where tgcol3 <> 1' % (mt)) @@ -303,7 +303,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -314,7 +314,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 <> 0 tdLog.info('select * from %s where tgcol4 <> 0' % (mt)) tdSql.query('select * from %s where tgcol4 <> 0' % (mt)) @@ -322,7 +322,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) tdSql.query('select * from %s where tgcol4 = 1' % (mt)) @@ -330,7 +330,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 <> 1 tdLog.info('select * from %s where tgcol4 <> 1' % (mt)) tdSql.query('select * from %s where tgcol4 <> 1' % (mt)) @@ -338,7 +338,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -349,7 +349,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 <> 0 tdLog.info('select * from %s where tgcol5 <> 0' % (mt)) tdSql.query('select * from %s where tgcol5 <> 0' % (mt)) @@ -357,7 +357,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 = 1 tdLog.info('select * from %s where tgcol5 = 1' % (mt)) tdSql.query('select * from %s where tgcol5 = 1' % (mt)) @@ -365,7 +365,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 <> 1 tdLog.info('select * from %s where tgcol5 <> 1' % (mt)) tdSql.query('select * from %s where tgcol5 <> 1' % (mt)) @@ -373,7 +373,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol1 <> 1' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 = 0' % @@ -412,7 +412,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 <> 0' % @@ -424,7 +424,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 = 0' % @@ -436,7 +436,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 <> 0' % @@ -448,7 +448,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 tdLog.info( @@ -461,7 +461,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and # ts < now + 5m tdLog.info( @@ -474,7 +474,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -489,7 +489,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> 1' % @@ -501,7 +501,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = 0' % @@ -513,7 +513,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> 0' % @@ -525,7 +525,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = 0' % @@ -537,7 +537,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -549,7 +549,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -562,7 +562,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m tdLog.info( @@ -575,7 +575,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -590,7 +590,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol3 <> 1' % @@ -602,7 +602,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol3 = 0' % @@ -614,7 +614,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol3 <> 0' % @@ -626,7 +626,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 = 0' % @@ -638,7 +638,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 <> 0' % @@ -650,7 +650,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 tdLog.info( @@ -663,7 +663,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m tdLog.info( @@ -676,7 +676,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -691,7 +691,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol4 <> 1' % @@ -703,7 +703,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol4 = 0' % @@ -715,7 +715,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol4 <> 0' % @@ -727,7 +727,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 = 0' % @@ -739,7 +739,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 <> 0' % @@ -751,7 +751,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 tdLog.info( @@ -764,7 +764,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m tdLog.info( @@ -777,7 +777,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -792,7 +792,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol5 <> 1' % @@ -804,7 +804,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol5 = 0' % @@ -816,7 +816,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol5 <> 0' % @@ -828,7 +828,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol5 = 0' % @@ -840,7 +840,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol5 <> 0' % @@ -852,7 +852,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 tdLog.info( @@ -865,7 +865,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m tdLog.info( @@ -878,7 +878,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -894,7 +894,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and # tgcol1 <> 1 tdLog.info( @@ -907,7 +907,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -920,7 +920,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -933,7 +933,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -946,7 +946,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -959,7 +959,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol1 <> 0 tdLog.info( @@ -972,7 +972,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol1 <> 0 tdLog.info( @@ -985,7 +985,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -1001,7 +1001,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and # tgcol2 <> 1 tdLog.info( @@ -1014,7 +1014,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -1027,7 +1027,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -1040,7 +1040,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -1053,7 +1053,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -1066,7 +1066,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol2 <> 0 tdLog.info( @@ -1079,7 +1079,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 tdLog.info( @@ -1092,7 +1092,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -1108,7 +1108,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1121,7 +1121,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1134,7 +1134,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1147,7 +1147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1160,7 +1160,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1173,7 +1173,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1186,7 +1186,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1199,7 +1199,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -1215,7 +1215,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1228,7 +1228,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and # tgcol4 = 0 tdLog.info( @@ -1241,7 +1241,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1254,7 +1254,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and # tgcol4 = 0 tdLog.info( @@ -1267,7 +1267,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1280,7 +1280,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1293,7 +1293,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1306,7 +1306,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -1322,7 +1322,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1335,7 +1335,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1348,7 +1348,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1361,7 +1361,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1374,7 +1374,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1387,7 +1387,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1400,7 +1400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1413,7 +1413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -1429,7 +1429,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1442,7 +1442,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1455,7 +1455,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1468,7 +1468,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1481,7 +1481,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1494,7 +1494,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1507,7 +1507,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1520,7 +1520,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -1536,7 +1536,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 tdLog.info( @@ -1549,7 +1549,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1562,7 +1562,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1575,7 +1575,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1588,7 +1588,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1601,7 +1601,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1614,7 +1614,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 @@ -1628,7 +1628,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step20 tdLog.info('=============== step20') @@ -1644,7 +1644,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 tdLog.info( @@ -1657,7 +1657,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 tdLog.info( @@ -1670,7 +1670,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 tdLog.info( @@ -1683,7 +1683,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 tdLog.info( @@ -1696,7 +1696,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 tdLog.info( @@ -1709,7 +1709,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and # tgcol5 <> 0 @@ -1723,7 +1723,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 and tgcol5 <> 0 @@ -1737,7 +1737,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step21 tdLog.info('=============== step21') @@ -1755,7 +1755,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step22 tdLog.info('=============== step22') @@ -1773,7 +1773,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -1790,7 +1790,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -1807,7 +1807,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -1824,7 +1824,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -1839,7 +1839,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step23 tdLog.info('=============== step23') @@ -1857,7 +1857,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1874,7 +1874,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1891,7 +1891,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1908,7 +1908,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1923,7 +1923,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1937,7 +1937,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step24 tdLog.info('=============== step24') @@ -1955,7 +1955,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2 @@ -1971,7 +1971,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3 @@ -1987,7 +1987,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4 @@ -2003,7 +2003,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5 @@ -2019,7 +2019,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step25 tdLog.info('=============== step25') @@ -2038,7 +2038,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2055,7 +2055,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2072,7 +2072,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2087,7 +2087,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2101,7 +2101,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step26 tdLog.info('=============== step26') @@ -2120,7 +2120,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2137,7 +2137,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2154,7 +2154,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2169,7 +2169,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2183,7 +2183,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2197,7 +2197,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step27 @@ -2217,7 +2217,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2234,7 +2234,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2251,7 +2251,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2264,7 +2264,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2278,7 +2278,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -2292,7 +2292,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/6.py b/tests/pytest/tag_lite/6.py index 52f6fe1b37..b789e41794 100644 --- a/tests/pytest/tag_lite/6.py +++ b/tests/pytest/tag_lite/6.py @@ -89,10 +89,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -120,10 +120,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -134,7 +134,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -143,7 +143,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -151,7 +151,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -159,7 +159,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -171,7 +171,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -182,7 +182,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % (mt)) tdSql.query('select * from %s where tgcol1 <> 0' % (mt)) @@ -190,7 +190,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % (mt)) tdSql.query('select * from %s where tgcol1 = 1' % (mt)) @@ -198,7 +198,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % (mt)) tdSql.query('select * from %s where tgcol1 <> 1' % (mt)) @@ -206,7 +206,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % (mt)) tdSql.query('select * from %s where tgcol1 = 1' % (mt)) @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % (mt)) tdSql.query('select * from %s where tgcol1 <> 1' % (mt)) @@ -222,7 +222,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 0 tdLog.info('select * from %s where tgcol1 = 0' % (mt)) tdSql.query('select * from %s where tgcol1 = 0' % (mt)) @@ -230,7 +230,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % (mt)) tdSql.query('select * from %s where tgcol1 <> 0' % (mt)) @@ -238,7 +238,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -249,7 +249,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % (mt)) tdSql.query('select * from %s where tgcol2 <> 0' % (mt)) @@ -257,7 +257,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % (mt)) tdSql.query('select * from %s where tgcol2 = 1' % (mt)) @@ -265,7 +265,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -284,7 +284,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 <> 0 tdLog.info('select * from %s where tgcol3 <> 0' % (mt)) tdSql.query('select * from %s where tgcol3 <> 0' % (mt)) @@ -292,7 +292,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 1 tdLog.info('select * from %s where tgcol3 = 1' % (mt)) tdSql.query('select * from %s where tgcol3 = 1' % (mt)) @@ -300,7 +300,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 <> 1 tdLog.info('select * from %s where tgcol3 <> 1' % (mt)) tdSql.query('select * from %s where tgcol3 <> 1' % (mt)) @@ -308,7 +308,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -319,7 +319,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 <> 0 tdLog.info('select * from %s where tgcol4 <> 0' % (mt)) tdSql.query('select * from %s where tgcol4 <> 0' % (mt)) @@ -327,7 +327,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) tdSql.query('select * from %s where tgcol4 = 1' % (mt)) @@ -335,7 +335,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 <> 1 tdLog.info('select * from %s where tgcol4 <> 1' % (mt)) tdSql.query('select * from %s where tgcol4 <> 1' % (mt)) @@ -343,7 +343,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 <> 0 tdLog.info('select * from %s where tgcol5 <> 0' % (mt)) tdSql.query('select * from %s where tgcol5 <> 0' % (mt)) @@ -362,7 +362,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 = 1 tdLog.info('select * from %s where tgcol5 = 1' % (mt)) tdSql.query('select * from %s where tgcol5 = 1' % (mt)) @@ -370,7 +370,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 <> 1 tdLog.info('select * from %s where tgcol5 <> 1' % (mt)) tdSql.query('select * from %s where tgcol5 <> 1' % (mt)) @@ -378,7 +378,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -389,7 +389,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 <> 0 tdLog.info('select * from %s where tgcol6 <> 0' % (mt)) tdSql.query('select * from %s where tgcol6 <> 0' % (mt)) @@ -397,7 +397,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 = 1 tdLog.info('select * from %s where tgcol6 = 1' % (mt)) tdSql.query('select * from %s where tgcol6 = 1' % (mt)) @@ -405,7 +405,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 <> 1 tdLog.info('select * from %s where tgcol6 <> 1' % (mt)) tdSql.query('select * from %s where tgcol6 <> 1' % (mt)) @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -428,7 +428,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol1 <> 1' % @@ -440,7 +440,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 = 0' % @@ -452,7 +452,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 <> 0' % @@ -464,7 +464,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 = 0' % @@ -476,7 +476,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 <> 0' % @@ -488,7 +488,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 tdLog.info( @@ -501,7 +501,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and # ts < now + 5m tdLog.info( @@ -514,7 +514,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -529,7 +529,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> 1' % @@ -541,7 +541,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = 0' % @@ -553,7 +553,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> 0' % @@ -565,7 +565,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = 0' % @@ -577,7 +577,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -589,7 +589,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -602,7 +602,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m tdLog.info( @@ -615,7 +615,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -630,7 +630,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol3 <> 1' % @@ -642,7 +642,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol3 = 0' % @@ -654,7 +654,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol3 <> 0' % @@ -666,7 +666,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 = 0' % @@ -678,7 +678,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 <> 0' % @@ -690,7 +690,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 tdLog.info( @@ -703,7 +703,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m tdLog.info( @@ -716,7 +716,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -731,7 +731,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol4 <> 1' % @@ -743,7 +743,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol4 = 0' % @@ -755,7 +755,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol4 <> 0' % @@ -767,7 +767,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 = 0' % @@ -779,7 +779,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 <> 0' % @@ -791,7 +791,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 tdLog.info( @@ -804,7 +804,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m tdLog.info( @@ -817,7 +817,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -832,7 +832,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol5 <> 1' % @@ -844,7 +844,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol5 = 0' % @@ -856,7 +856,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol5 <> 0' % @@ -868,7 +868,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol5 = 0' % @@ -880,7 +880,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol5 <> 0' % @@ -892,7 +892,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 tdLog.info( @@ -905,7 +905,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m tdLog.info( @@ -918,7 +918,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -933,7 +933,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol6 <> 1' % @@ -945,7 +945,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol6 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol6 = 0' % @@ -957,7 +957,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol6 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol6 <> 0' % @@ -969,7 +969,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol6 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol6 = 0' % @@ -981,7 +981,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol6 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol6 <> 0' % @@ -993,7 +993,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol6 <> 0 tdLog.info( @@ -1006,7 +1006,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 <> 0 and # ts < now + 5m tdLog.info( @@ -1019,7 +1019,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -1035,7 +1035,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and # tgcol1 <> 1 tdLog.info( @@ -1048,7 +1048,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -1061,7 +1061,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -1074,7 +1074,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -1087,7 +1087,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -1100,7 +1100,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1113,7 +1113,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol1 <> 0 tdLog.info( @@ -1126,7 +1126,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -1142,7 +1142,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and # tgcol2 <> 1 tdLog.info( @@ -1155,7 +1155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -1168,7 +1168,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -1181,7 +1181,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -1194,7 +1194,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -1207,7 +1207,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol2 <> 0 tdLog.info( @@ -1220,7 +1220,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 tdLog.info( @@ -1233,7 +1233,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -1249,7 +1249,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1262,7 +1262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1275,7 +1275,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1288,7 +1288,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1301,7 +1301,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1314,7 +1314,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1327,7 +1327,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1340,7 +1340,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -1356,7 +1356,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1369,7 +1369,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and # tgcol4 = 0 tdLog.info( @@ -1382,7 +1382,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1395,7 +1395,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and # tgcol4 = 0 tdLog.info( @@ -1408,7 +1408,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1421,7 +1421,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1434,7 +1434,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1447,7 +1447,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -1463,7 +1463,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and # tgcol6 <> 1 tdLog.info( @@ -1476,7 +1476,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and # tgcol6 = 0 tdLog.info( @@ -1489,7 +1489,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and # tgcol6 <> 0 tdLog.info( @@ -1502,7 +1502,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and # tgcol6 = 0 tdLog.info( @@ -1515,7 +1515,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and # tgcol6 <> 0 tdLog.info( @@ -1528,7 +1528,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 and tgcol6 <> 0 tdLog.info( @@ -1541,7 +1541,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol6 <> 0 tdLog.info( @@ -1554,7 +1554,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step20 tdLog.info('=============== step20') @@ -1570,7 +1570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1583,7 +1583,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1596,7 +1596,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1609,7 +1609,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1622,7 +1622,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1635,7 +1635,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1648,7 +1648,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1661,7 +1661,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step21 tdLog.info('=============== step21') @@ -1677,7 +1677,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1690,7 +1690,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1703,7 +1703,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1716,7 +1716,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1729,7 +1729,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1742,7 +1742,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1755,7 +1755,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1768,7 +1768,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step22 tdLog.info('=============== step22') @@ -1784,7 +1784,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 tdLog.info( @@ -1797,7 +1797,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1810,7 +1810,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1823,7 +1823,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1836,7 +1836,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1849,7 +1849,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1862,7 +1862,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 @@ -1876,7 +1876,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step23 tdLog.info('=============== step23') @@ -1892,7 +1892,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 tdLog.info( @@ -1905,7 +1905,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 tdLog.info( @@ -1918,7 +1918,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 tdLog.info( @@ -1931,7 +1931,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 tdLog.info( @@ -1944,7 +1944,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 tdLog.info( @@ -1957,7 +1957,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and # tgcol5 <> 0 @@ -1971,7 +1971,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 and tgcol5 <> 0 @@ -1985,7 +1985,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step24 tdLog.info('=============== step24') @@ -2002,7 +2002,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and # tgcol6 <> 1 @@ -2016,7 +2016,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = # 0 @@ -2030,7 +2030,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and # tgcol6 <> 0 @@ -2044,7 +2044,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = # 0 @@ -2058,7 +2058,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and # tgcol6 <> 0 @@ -2072,7 +2072,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and # tgcol5 <> 0 and tgcol6 <> 0 @@ -2086,7 +2086,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0 @@ -2100,7 +2100,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step25 tdLog.info('=============== step25') @@ -2118,7 +2118,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step26 tdLog.info('=============== step26') @@ -2136,7 +2136,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2153,7 +2153,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2170,7 +2170,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2187,7 +2187,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2202,7 +2202,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2216,7 +2216,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step27 tdLog.info('=============== step27') @@ -2234,7 +2234,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2251,7 +2251,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2268,7 +2268,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2285,7 +2285,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2300,7 +2300,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2314,7 +2314,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2328,7 +2328,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step28 tdLog.info('=============== step28') @@ -2346,7 +2346,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2 @@ -2362,7 +2362,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3 @@ -2378,7 +2378,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4 @@ -2394,7 +2394,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5 @@ -2410,7 +2410,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol6 @@ -2426,7 +2426,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step29 tdLog.info('=============== step29') @@ -2445,7 +2445,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2462,7 +2462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2479,7 +2479,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2494,7 +2494,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2508,7 +2508,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2522,7 +2522,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step30 tdLog.info('=============== step30') @@ -2541,7 +2541,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2558,7 +2558,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2575,7 +2575,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2590,7 +2590,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2604,7 +2604,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2618,7 +2618,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2632,7 +2632,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step31 tdLog.info('=============== step31') @@ -2651,7 +2651,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2668,7 +2668,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2685,7 +2685,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2698,7 +2698,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2712,7 +2712,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2726,7 +2726,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -2740,7 +2740,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/add.py b/tests/pytest/tag_lite/add.py index e9e3675485..1a45237cb0 100644 --- a/tests/pytest/tag_lite/add.py +++ b/tests/pytest/tag_lite/add.py @@ -77,22 +77,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -119,22 +119,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step2 tdLog.info('select * from %s where tgcol2 = 1 -x step2' % (mt)) @@ -171,22 +171,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -213,22 +213,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step3 tdLog.info('select * from %s where tgcol2 = 1 -x step3' % (mt)) @@ -265,22 +265,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -289,22 +289,22 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "BIGINT")') tdSql.checkDataType(2, 1, "BIGINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != FLOAT then tdLog.info('tdSql.checkDataType(3, 1, "FLOAT")') tdSql.checkDataType(3, 1, "FLOAT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != 1 then tdLog.info('tdSql.checkData(2, 3, 1)') tdSql.checkData(2, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data33 != 2.000000 then tdLog.info('tdSql.checkData(3, 3, 2.000000)') tdSql.checkData(3, 3, 2.000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -331,22 +331,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step4 tdLog.info('select * from %s where tgcol2 = 1 -x step4' % (mt)) @@ -383,22 +383,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -425,22 +425,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = '1' -x step5 tdLog.info('select * from %s where tgcol3 = "1" -x step5' % (mt)) @@ -477,27 +477,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -540,27 +540,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '6' tdLog.info('select * from %s where tgcol6 = "6"' % (mt)) @@ -571,27 +571,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) @@ -600,7 +600,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 1 -x step52 tdLog.info('select * from %s where tgcol3 = 1 -x step52' % (mt)) tdSql.error('select * from %s where tgcol3 = 12' % (mt)) @@ -636,27 +636,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -699,27 +699,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step71 tdLog.info('select * from %s where tgcol2 = 1 -x step71' % (mt)) @@ -761,27 +761,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -825,27 +825,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 1 then tdLog.info('tdSql.checkData(0, 4, 1)') tdSql.checkData(0, 4, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step81 tdLog.info('select * from %s where tgcol2 = 1 -x step81' % (mt)) @@ -887,27 +887,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -950,27 +950,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4.000000000 then tdLog.info('tdSql.checkData(0, 2, 4.000000000)') tdSql.checkData(0, 2, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6.00000 then tdLog.info('tdSql.checkData(0, 4, 6.00000)') tdSql.checkData(0, 4, 6.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 1 -x step91 tdLog.info('select * from %s where tgcol3 = 1 -x step91' % (mt)) @@ -1016,32 +1016,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step103 tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step103' % (mt)) @@ -1090,32 +1090,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 0 then tdLog.info('tdSql.checkData(0, 4, 0)') tdSql.checkData(0, 4, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step101 tdLog.info('select * from %s where tgcol2 = 1 -x step101' % (mt)) @@ -1161,37 +1161,37 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.00000 then tdLog.info('tdSql.checkData(0, 5, 4.00000)') tdSql.checkData(0, 5, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step114 tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step114' % (mt)) @@ -1261,42 +1261,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 6 then tdLog.info('tdSql.checkData(0, 5, 6)') tdSql.checkData(0, 5, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 7 then tdLog.info('tdSql.checkData(0, 6, 7)') tdSql.checkData(0, 6, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 8 then tdLog.info('tdSql.checkData(0, 7, 8)') tdSql.checkData(0, 7, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step111 tdLog.info('select * from %s where tgcol2 = 1 -x step111' % (mt)) @@ -1348,42 +1348,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3.00000 then tdLog.info('tdSql.checkData(0, 4, 3.00000)') tdSql.checkData(0, 4, 3.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.000000000 then tdLog.info('tdSql.checkData(0, 5, 4.000000000)') tdSql.checkData(0, 5, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -1447,42 +1447,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 3 then tdLog.info('tdSql.checkData(0, 6, 3)') tdSql.checkData(0, 6, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 2 then tdLog.info('tdSql.checkData(0, 7, 2)') tdSql.checkData(0, 7, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '5' tdLog.info('select * from %s where tgcol2 = "5"' % (mt)) @@ -1491,7 +1491,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 4 tdLog.info('select * from %s where tgcol3 = 4' % (mt)) @@ -1500,7 +1500,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol5 = 2 tdLog.info('select * from %s where tgcol5 = 2' % (mt)) @@ -1509,7 +1509,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '1' tdLog.info('select * from %s where tgcol6 = "1"' % (mt)) @@ -1518,7 +1518,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -1554,42 +1554,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -1647,42 +1647,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 9 then tdLog.info('tdSql.checkData(0, 3, 9)') tdSql.checkData(0, 3, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 11.000000000 then tdLog.info('tdSql.checkData(0, 4, 11.000000000)') tdSql.checkData(0, 4, 11.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 8 then tdLog.info('tdSql.checkData(0, 5, 8)') tdSql.checkData(0, 5, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 10 then tdLog.info('tdSql.checkData(0, 6, 10)') tdSql.checkData(0, 6, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 12 then tdLog.info('tdSql.checkData(0, 7, 12)') tdSql.checkData(0, 7, 12) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -1753,7 +1753,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/bigint.py b/tests/pytest/tag_lite/bigint.py index 77a161c5bc..ecc6fad44d 100644 --- a/tests/pytest/tag_lite/bigint.py +++ b/tests/pytest/tag_lite/bigint.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/binary.py b/tests/pytest/tag_lite/binary.py index 543b00b34e..a5757dc5cd 100644 --- a/tests/pytest/tag_lite/binary.py +++ b/tests/pytest/tag_lite/binary.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '0' tdLog.info('select * from %s where tgcol <> "0"' % (mt)) tdSql.query('select * from %s where tgcol <> "0"' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '1' tdLog.info('select * from %s where tgcol = "1"' % (mt)) tdSql.query('select * from %s where tgcol = "1"' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '1' tdLog.info('select * from %s where tgcol <> "1"' % (mt)) tdSql.query('select * from %s where tgcol <> "1"' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '1' tdLog.info('select * from %s where tgcol = "1"' % (mt)) tdSql.query('select * from %s where tgcol = "1"' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '1' tdLog.info('select * from %s where tgcol <> "1"' % (mt)) tdSql.query('select * from %s where tgcol <> "1"' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '0' tdLog.info('select * from %s where tgcol = "0"' % (mt)) tdSql.query('select * from %s where tgcol = "0"' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '0' tdLog.info('select * from %s where tgcol <> "0"' % (mt)) tdSql.query('select * from %s where tgcol <> "0"' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -344,7 +344,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> "1"' % @@ -356,7 +356,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol = "0"' % @@ -368,7 +368,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> "0"' % @@ -380,7 +380,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = "0"' % @@ -392,7 +392,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> "0"' % @@ -404,7 +404,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> '0' tdLog.info( @@ -417,7 +417,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '0' and # ts < now + 5m tdLog.info( @@ -430,7 +430,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -448,7 +448,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -466,7 +466,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -484,7 +484,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -502,7 +502,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -521,7 +521,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -540,7 +540,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -560,7 +560,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -574,7 +574,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/binary_binary.py b/tests/pytest/tag_lite/binary_binary.py index c0d1c0bfe7..9c789eafd6 100644 --- a/tests/pytest/tag_lite/binary_binary.py +++ b/tests/pytest/tag_lite/binary_binary.py @@ -84,10 +84,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -112,10 +112,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -126,7 +126,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -135,7 +135,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -143,7 +143,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -151,7 +151,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -163,7 +163,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -174,7 +174,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '0' tdLog.info('select * from %s where tgcol <> "0"' % (mt)) tdSql.query('select * from %s where tgcol <> "0"' % (mt)) @@ -182,7 +182,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '1' tdLog.info('select * from %s where tgcol = "1"' % (mt)) tdSql.query('select * from %s where tgcol = "1"' % (mt)) @@ -190,7 +190,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '1' tdLog.info('select * from %s where tgcol <> "1"' % (mt)) tdSql.query('select * from %s where tgcol <> "1"' % (mt)) @@ -198,7 +198,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '1' tdLog.info('select * from %s where tgcol = "1"' % (mt)) tdSql.query('select * from %s where tgcol = "1"' % (mt)) @@ -206,7 +206,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '1' tdLog.info('select * from %s where tgcol <> "1"' % (mt)) tdSql.query('select * from %s where tgcol <> "1"' % (mt)) @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '0' tdLog.info('select * from %s where tgcol = "0"' % (mt)) tdSql.query('select * from %s where tgcol = "0"' % (mt)) @@ -222,7 +222,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '0' tdLog.info('select * from %s where tgcol <> "0"' % (mt)) tdSql.query('select * from %s where tgcol <> "0"' % (mt)) @@ -230,7 +230,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -241,7 +241,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '0' tdLog.info('select * from %s where tgcol2 <> "0"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "0"' % (mt)) @@ -249,7 +249,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = '1' tdLog.info('select * from %s where tgcol2 = "1"' % (mt)) tdSql.query('select * from %s where tgcol2 = "1"' % (mt)) @@ -257,7 +257,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '1' tdLog.info('select * from %s where tgcol2 <> "1"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "1"' % (mt)) @@ -265,7 +265,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -280,7 +280,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> "1"' % @@ -292,7 +292,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol = "0"' % @@ -304,7 +304,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> "0"' % @@ -316,7 +316,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = "0"' % @@ -328,7 +328,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> "0"' % @@ -340,7 +340,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> '0' tdLog.info( @@ -353,7 +353,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '0' and # ts < now + 5m tdLog.info( @@ -366,7 +366,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -381,7 +381,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> "1"' % @@ -393,7 +393,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = "0"' % @@ -405,7 +405,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> "0"' % @@ -417,7 +417,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = "0"' % @@ -429,7 +429,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> "0"' % @@ -441,7 +441,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' tdLog.info( @@ -454,7 +454,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m tdLog.info( @@ -467,7 +467,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -483,7 +483,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and # tgcol <> '1' tdLog.info( @@ -496,7 +496,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and # tgcol = '0' tdLog.info( @@ -509,7 +509,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and # tgcol <> '0' tdLog.info( @@ -522,7 +522,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and # tgcol = '0' tdLog.info( @@ -535,7 +535,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' # and tgcol <> '0' tdLog.info( @@ -548,7 +548,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' and tgcol <> '0' tdLog.info( @@ -561,7 +561,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m and ts < now + 5m and tgcol <> '0' tdLog.info( @@ -574,7 +574,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -592,7 +592,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -610,7 +610,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -626,7 +626,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and @@ -643,7 +643,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -661,7 +661,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -679,7 +679,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -698,7 +698,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -715,7 +715,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and @@ -732,7 +732,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -752,7 +752,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -771,7 +771,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -785,7 +785,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/bool.py b/tests/pytest/tag_lite/bool.py index c43d5b2ee5..6f2afd2625 100644 --- a/tests/pytest/tag_lite/bool.py +++ b/tests/pytest/tag_lite/bool.py @@ -81,10 +81,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -107,10 +107,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -122,7 +122,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -130,7 +130,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -138,7 +138,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -146,7 +146,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -154,7 +154,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -166,7 +166,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -178,7 +178,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -190,7 +190,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -203,7 +203,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -223,7 +223,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -231,7 +231,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -239,7 +239,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -251,7 +251,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -270,7 +270,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -280,7 +280,7 @@ class TDTestCase: # TSIM: print expect 100, actual:$rows tdLog.info('expect 100, actual:$rows') # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -288,7 +288,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = true tdLog.info('select * from %s where tgcol = true' % (mt)) tdSql.query('select * from %s where tgcol = true' % (mt)) @@ -296,7 +296,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> true tdLog.info('select * from %s where tgcol <> true' % (mt)) tdSql.query('select * from %s where tgcol <> true' % (mt)) @@ -304,7 +304,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = false tdLog.info('select * from %s where tgcol = false' % (mt)) tdSql.query('select * from %s where tgcol = false' % (mt)) @@ -312,7 +312,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> false tdLog.info('select * from %s where tgcol <> false' % (mt)) tdSql.query('select * from %s where tgcol <> false' % (mt)) @@ -320,7 +320,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -335,7 +335,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> true' % @@ -347,7 +347,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false tdLog.info( 'select * from %s where ts < now + 4m and tgcol = false' % @@ -359,7 +359,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> false' % @@ -371,7 +371,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = false' % @@ -383,7 +383,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> false' % @@ -395,7 +395,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> false tdLog.info( @@ -408,7 +408,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false # and ts < now + 5m tdLog.info( @@ -421,7 +421,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -439,7 +439,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -457,7 +457,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -475,7 +475,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -493,7 +493,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -512,7 +512,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -531,7 +531,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -555,7 +555,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -569,7 +569,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/bool_binary.py b/tests/pytest/tag_lite/bool_binary.py index 7105cc4e78..bfc496e8e4 100644 --- a/tests/pytest/tag_lite/bool_binary.py +++ b/tests/pytest/tag_lite/bool_binary.py @@ -81,10 +81,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): tb = "%s%d" % (tbPrefix, i) @@ -106,10 +106,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -120,7 +120,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -129,7 +129,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -137,7 +137,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -145,7 +145,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -157,7 +157,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -168,7 +168,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -176,7 +176,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -184,7 +184,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -192,7 +192,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = true tdLog.info('select * from %s where tgcol = true' % (mt)) tdSql.query('select * from %s where tgcol = true' % (mt)) @@ -200,7 +200,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> true tdLog.info('select * from %s where tgcol <> true' % (mt)) tdSql.query('select * from %s where tgcol <> true' % (mt)) @@ -208,7 +208,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = false tdLog.info('select * from %s where tgcol = false' % (mt)) tdSql.query('select * from %s where tgcol = false' % (mt)) @@ -216,7 +216,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> false tdLog.info('select * from %s where tgcol <> false' % (mt)) tdSql.query('select * from %s where tgcol <> false' % (mt)) @@ -224,7 +224,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -235,7 +235,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '0' tdLog.info('select * from %s where tgcol2 <> "0"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "0"' % (mt)) @@ -243,7 +243,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = '1' tdLog.info('select * from %s where tgcol2 = "1"' % (mt)) tdSql.query('select * from %s where tgcol2 = "1"' % (mt)) @@ -251,7 +251,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> "1" tdLog.info('select * from %s where tgcol2 <> "1"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "1"' % (mt)) @@ -259,7 +259,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -274,7 +274,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> true' % @@ -286,7 +286,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false tdLog.info( 'select * from %s where ts < now + 4m and tgcol = false' % @@ -298,7 +298,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> false' % @@ -310,7 +310,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = false' % @@ -322,7 +322,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> false' % @@ -334,7 +334,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> false tdLog.info( @@ -347,7 +347,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false # and ts < now + 5m tdLog.info( @@ -360,7 +360,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -375,7 +375,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> "1"' % @@ -387,7 +387,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = "0"' % @@ -399,7 +399,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> "0"' % @@ -411,7 +411,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = "0"' % @@ -423,7 +423,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> "0"' % @@ -435,7 +435,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' tdLog.info( @@ -448,7 +448,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m tdLog.info( @@ -461,7 +461,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -477,7 +477,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and # tgcol <> true tdLog.info( @@ -490,7 +490,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and # tgcol = false tdLog.info( @@ -503,7 +503,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and # tgcol <> false tdLog.info( @@ -516,7 +516,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and # tgcol = false tdLog.info( @@ -529,7 +529,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' # and tgcol <> false tdLog.info( @@ -542,7 +542,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' and tgcol <> false tdLog.info( @@ -555,7 +555,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m and ts < now + 5m and tgcol <> false tdLog.info( @@ -568,7 +568,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -586,7 +586,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -604,7 +604,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -620,7 +620,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and @@ -637,7 +637,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -655,7 +655,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -673,7 +673,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -692,7 +692,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -709,7 +709,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and @@ -726,7 +726,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -746,7 +746,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -765,7 +765,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -779,7 +779,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/bool_int.py b/tests/pytest/tag_lite/bool_int.py index b7504b1127..f7bfc7acef 100644 --- a/tests/pytest/tag_lite/bool_int.py +++ b/tests/pytest/tag_lite/bool_int.py @@ -81,10 +81,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): tb = "%s%d" % (tbPrefix, i) @@ -106,10 +106,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -120,7 +120,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -129,7 +129,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -137,7 +137,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -145,7 +145,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -157,7 +157,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -168,7 +168,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -176,7 +176,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -184,7 +184,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -192,7 +192,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = true tdLog.info('select * from %s where tgcol = true' % (mt)) tdSql.query('select * from %s where tgcol = true' % (mt)) @@ -200,7 +200,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> true tdLog.info('select * from %s where tgcol <> true' % (mt)) tdSql.query('select * from %s where tgcol <> true' % (mt)) @@ -208,7 +208,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = false tdLog.info('select * from %s where tgcol = false' % (mt)) tdSql.query('select * from %s where tgcol = false' % (mt)) @@ -216,7 +216,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> false tdLog.info('select * from %s where tgcol <> false' % (mt)) tdSql.query('select * from %s where tgcol <> false' % (mt)) @@ -224,7 +224,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -235,7 +235,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % (mt)) tdSql.query('select * from %s where tgcol2 <> 0' % (mt)) @@ -243,7 +243,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % (mt)) tdSql.query('select * from %s where tgcol2 = 1' % (mt)) @@ -251,7 +251,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -259,7 +259,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = true tdLog.info('select * from %s where tgcol2 = true' % (mt)) tdSql.query('select * from %s where tgcol2 = true' % (mt)) @@ -267,7 +267,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> true tdLog.info('select * from %s where tgcol2 <> true' % (mt)) tdSql.query('select * from %s where tgcol2 <> true' % (mt)) @@ -275,7 +275,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = false tdLog.info('select * from %s where tgcol2 = false' % (mt)) tdSql.query('select * from %s where tgcol2 = false' % (mt)) @@ -283,7 +283,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> false tdLog.info('select * from %s where tgcol2 <> false' % (mt)) tdSql.query('select * from %s where tgcol2 <> false' % (mt)) @@ -291,7 +291,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -306,7 +306,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> true' % @@ -318,7 +318,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false tdLog.info( 'select * from %s where ts < now + 4m and tgcol = false' % @@ -330,7 +330,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> false' % @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = false' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> false' % @@ -366,7 +366,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> false tdLog.info( @@ -379,7 +379,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false # and ts < now + 5m tdLog.info( @@ -392,7 +392,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -407,7 +407,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> 1' % @@ -419,7 +419,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = 0' % @@ -431,7 +431,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> 0' % @@ -443,7 +443,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = 0' % @@ -455,7 +455,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -467,7 +467,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m tdLog.info( @@ -493,7 +493,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -509,7 +509,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and # tgcol <> true tdLog.info( @@ -522,7 +522,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and # tgcol = false tdLog.info( @@ -535,7 +535,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and # tgcol <> false tdLog.info( @@ -548,7 +548,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and # tgcol = false tdLog.info( @@ -561,7 +561,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and # tgcol <> false tdLog.info( @@ -574,7 +574,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol <> false tdLog.info( @@ -587,7 +587,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol <> false tdLog.info( @@ -600,7 +600,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -618,7 +618,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -636,7 +636,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 @@ -652,7 +652,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and @@ -669,7 +669,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -687,7 +687,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -705,7 +705,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -724,7 +724,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group @@ -741,7 +741,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and @@ -758,7 +758,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -778,7 +778,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -797,7 +797,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -811,7 +811,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/change.py b/tests/pytest/tag_lite/change.py index e1df901d5b..910d11ca7c 100644 --- a/tests/pytest/tag_lite/change.py +++ b/tests/pytest/tag_lite/change.py @@ -66,22 +66,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tagcx tgcol3 -x step21 # TSIM: return -1 @@ -123,22 +123,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol3 # TSIM: sql alter table $mt change tag tgcol2 tgcol4 @@ -167,22 +167,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol3 # TSIM: sql alter table $mt change tag tgcol2 tgcol4 @@ -211,22 +211,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol3 # TSIM: sql alter table $mt change tag tgcol2 tgcol4 @@ -255,42 +255,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 # TSIM: sql reset query cache @@ -331,22 +331,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 2 tdLog.info('select * from $mt where tgcol4 = 2') @@ -357,22 +357,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -400,22 +400,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 2 tdLog.info('select * from $mt where tgcol4 = 2') @@ -426,22 +426,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -469,22 +469,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 2 tdLog.info('select * from $mt where tgcol4 = 2') @@ -495,22 +495,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -538,22 +538,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = '2' tdLog.info('select * from $mt where tgcol4 = '2'') @@ -564,22 +564,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -627,42 +627,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol8 = 2 tdLog.info('select * from $mt where tgcol8 = 2') @@ -673,42 +673,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol9 = '4' tdLog.info('select * from $mt where tgcol9 = '4'') @@ -719,42 +719,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol10 = 5 tdLog.info('select * from $mt where tgcol10 = 5') @@ -765,42 +765,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol11 = '6' tdLog.info('select * from $mt where tgcol11 = '6'') @@ -811,42 +811,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -860,7 +860,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/column.py b/tests/pytest/tag_lite/column.py index 4669f74498..f82f83c356 100644 --- a/tests/pytest/tag_lite/column.py +++ b/tests/pytest/tag_lite/column.py @@ -103,7 +103,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(4)') tdSql.checkRows(4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -149,7 +149,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -160,7 +160,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(4)') tdSql.checkRows(4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) @@ -169,7 +169,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -183,7 +183,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/commit.py b/tests/pytest/tag_lite/commit.py index 4ad2ecf8f9..478520a586 100644 --- a/tests/pytest/tag_lite/commit.py +++ b/tests/pytest/tag_lite/commit.py @@ -77,22 +77,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -119,22 +119,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step2 tdLog.info('select * from %s where tgcol2 = 1 -x step2' % (mt)) @@ -171,22 +171,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -213,22 +213,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step3 tdLog.info('select * from %s where tgcol2 = 1 -x step3' % (mt)) @@ -265,22 +265,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -289,22 +289,22 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "BIGINT")') tdSql.checkDataType(2, 1, "BIGINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != FLOAT then tdLog.info('tdSql.checkDataType(3, 1, "FLOAT")') tdSql.checkDataType(3, 1, "FLOAT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != 1 then tdLog.info('tdSql.checkData(2, 3, 1)') tdSql.checkData(2, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data33 != 2.000000 then tdLog.info('tdSql.checkData(3, 3, 2.000000)') tdSql.checkData(3, 3, 2.000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -331,22 +331,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step4 tdLog.info('select * from %s where tgcol2 = 1 -x step4' % (mt)) @@ -383,22 +383,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -425,22 +425,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = '1' -x step5 tdLog.info('select * from %s where tgcol3 = "1" -x step5' % (mt)) @@ -477,27 +477,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -540,27 +540,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '6' tdLog.info('select * from %s where tgcol6 = "6"' % (mt)) @@ -571,27 +571,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) @@ -600,7 +600,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 1 -x step52 tdLog.info('select * from %s where tgcol3 = 1 -x step52' % (mt)) tdSql.error('select * from %s where tgcol3 = 12' % (mt)) @@ -636,27 +636,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -699,27 +699,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step71 tdLog.info('select * from %s where tgcol2 = 1 -x step71' % (mt)) @@ -761,27 +761,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -823,27 +823,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 1 then tdLog.info('tdSql.checkData(0, 4, 1)') tdSql.checkData(0, 4, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step81 tdLog.info('select * from %s where tgcol2 = 1 -x step81' % (mt)) @@ -885,27 +885,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -948,27 +948,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4.000000000 then tdLog.info('tdSql.checkData(0, 2, 4.000000000)') tdSql.checkData(0, 2, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6.00000 then tdLog.info('tdSql.checkData(0, 4, 6.00000)') tdSql.checkData(0, 4, 6.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 1 -x step91 tdLog.info('select * from %s where tgcol3 = 1 -x step91' % (mt)) @@ -1014,32 +1014,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step103 tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step103' % (mt)) @@ -1088,32 +1088,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 0 then tdLog.info('tdSql.checkData(0, 4, 0)') tdSql.checkData(0, 4, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step101 tdLog.info('select * from %s where tgcol2 = 1 -x step101' % (mt)) @@ -1159,37 +1159,37 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.00000 then tdLog.info('tdSql.checkData(0, 5, 4.00000)') tdSql.checkData(0, 5, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step114 tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step114' % (mt)) @@ -1259,42 +1259,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 6 then tdLog.info('tdSql.checkData(0, 5, 6)') tdSql.checkData(0, 5, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 7 then tdLog.info('tdSql.checkData(0, 6, 7)') tdSql.checkData(0, 6, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 8 then tdLog.info('tdSql.checkData(0, 7, 8)') tdSql.checkData(0, 7, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step111 tdLog.info('select * from %s where tgcol2 = 1 -x step111' % (mt)) @@ -1346,42 +1346,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3.00000 then tdLog.info('tdSql.checkData(0, 4, 3.00000)') tdSql.checkData(0, 4, 3.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.000000000 then tdLog.info('tdSql.checkData(0, 5, 4.000000000)') tdSql.checkData(0, 5, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -1445,42 +1445,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 3 then tdLog.info('tdSql.checkData(0, 6, 3)') tdSql.checkData(0, 6, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 2 then tdLog.info('tdSql.checkData(0, 7, 2)') tdSql.checkData(0, 7, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '5' tdLog.info('select * from %s where tgcol2 = "5"' % (mt)) @@ -1489,7 +1489,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 4 tdLog.info('select * from %s where tgcol3 = 4' % (mt)) @@ -1498,7 +1498,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol5 = 2 tdLog.info('select * from %s where tgcol5 = 2' % (mt)) @@ -1507,7 +1507,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '1' tdLog.info('select * from %s where tgcol6 = "1"' % (mt)) @@ -1516,7 +1516,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -1552,42 +1552,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -1645,42 +1645,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 9 then tdLog.info('tdSql.checkData(0, 3, 9)') tdSql.checkData(0, 3, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 11.000000000 then tdLog.info('tdSql.checkData(0, 4, 11.000000000)') tdSql.checkData(0, 4, 11.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 8 then tdLog.info('tdSql.checkData(0, 5, 8)') tdSql.checkData(0, 5, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 10 then tdLog.info('tdSql.checkData(0, 6, 10)') tdSql.checkData(0, 6, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 12 then tdLog.info('tdSql.checkData(0, 7, 12)') tdSql.checkData(0, 7, 12) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # TSIM: sleep 5000 @@ -1713,22 +1713,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -1748,22 +1748,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -1783,22 +1783,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step5 @@ -1819,22 +1819,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step6 @@ -1855,27 +1855,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '6' tdLog.info('select * from %s where tgcol6 = "6"' % (mt)) @@ -1886,27 +1886,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) @@ -1915,7 +1915,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -1935,27 +1935,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step8 @@ -1976,27 +1976,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 1 then tdLog.info('tdSql.checkData(0, 4, 1)') tdSql.checkData(0, 4, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step9 @@ -2017,27 +2017,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4.000000000 then tdLog.info('tdSql.checkData(0, 2, 4.000000000)') tdSql.checkData(0, 2, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6.00000 then tdLog.info('tdSql.checkData(0, 4, 6.00000)') tdSql.checkData(0, 4, 6.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step10 @@ -2058,32 +2058,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 0 then tdLog.info('tdSql.checkData(0, 4, 0)') tdSql.checkData(0, 4, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -2103,42 +2103,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 6 then tdLog.info('tdSql.checkData(0, 5, 6)') tdSql.checkData(0, 5, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 7 then tdLog.info('tdSql.checkData(0, 6, 7)') tdSql.checkData(0, 6, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 8 then tdLog.info('tdSql.checkData(0, 7, 8)') tdSql.checkData(0, 7, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -2159,42 +2159,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 3 then tdLog.info('tdSql.checkData(0, 6, 3)') tdSql.checkData(0, 6, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 2 then tdLog.info('tdSql.checkData(0, 7, 2)') tdSql.checkData(0, 7, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '5' tdLog.info('select * from %s where tgcol2 = "5"' % (mt)) @@ -2203,7 +2203,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 4 tdLog.info('select * from %s where tgcol3 = 4' % (mt)) @@ -2212,7 +2212,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol5 = 2 tdLog.info('select * from %s where tgcol5 = 2' % (mt)) @@ -2221,7 +2221,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '1' tdLog.info('select * from %s where tgcol6 = "1"' % (mt)) @@ -2230,7 +2230,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -2250,42 +2250,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 9 then tdLog.info('tdSql.checkData(0, 3, 9)') tdSql.checkData(0, 3, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 11.000000000 then tdLog.info('tdSql.checkData(0, 4, 11.000000000)') tdSql.checkData(0, 4, 11.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 8 then tdLog.info('tdSql.checkData(0, 5, 8)') tdSql.checkData(0, 5, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 10 then tdLog.info('tdSql.checkData(0, 6, 10)') tdSql.checkData(0, 6, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 12 then tdLog.info('tdSql.checkData(0, 7, 12)') tdSql.checkData(0, 7, 12) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -2299,7 +2299,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/create.py b/tests/pytest/tag_lite/create.py index 39a2d83a31..83a1450143 100644 --- a/tests/pytest/tag_lite/create.py +++ b/tests/pytest/tag_lite/create.py @@ -76,12 +76,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -89,7 +89,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -120,12 +120,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -133,7 +133,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -164,12 +164,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -177,7 +177,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -207,12 +207,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -220,7 +220,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -251,12 +251,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -264,7 +264,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -295,12 +295,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -310,7 +310,7 @@ class TDTestCase: # TSIM: print expect 0, actual: $rows tdLog.info('expect 0, actual: $rows') # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -341,12 +341,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -385,12 +385,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '0' tdLog.info('select * from %s where tgcol = "0"' % (mt)) tdSql.query('select * from %s where tgcol = "0"' % (mt)) @@ -398,7 +398,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -431,12 +431,12 @@ class TDTestCase: # TSIM: print expect 1, actual: $rows tdLog.info('expect 1, actual: $rows') # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -475,12 +475,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -488,7 +488,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -519,12 +519,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -532,7 +532,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -563,12 +563,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -576,7 +576,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -607,12 +607,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) @@ -621,7 +621,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: print =============== step15 tdLog.info('=============== step15') # TSIM: $i = 15 @@ -651,12 +651,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -664,7 +664,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -695,12 +695,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -708,7 +708,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -739,12 +739,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -752,7 +752,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -783,12 +783,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -796,7 +796,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -827,12 +827,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -840,7 +840,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step20 tdLog.info('=============== step20') @@ -871,12 +871,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -884,7 +884,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step21 tdLog.info('=============== step21') @@ -915,12 +915,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -928,7 +928,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step22 tdLog.info('=============== step22') @@ -959,12 +959,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -972,7 +972,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step23 tdLog.info('=============== step23') @@ -1003,12 +1003,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -1016,7 +1016,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step24 tdLog.info('=============== step24') @@ -1052,12 +1052,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 2 tdLog.info('select * from %s where tgcol2 = 2' % (mt)) tdSql.query('select * from %s where tgcol2 = 2' % (mt)) @@ -1065,12 +1065,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 3 tdLog.info('select * from %s where tgcol3 = 3' % (mt)) tdSql.query('select * from %s where tgcol3 = 3' % (mt)) @@ -1078,12 +1078,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 = 4 tdLog.info('select * from %s where tgcol4 = 4' % (mt)) tdSql.query('select * from %s where tgcol4 = 4' % (mt)) @@ -1091,12 +1091,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 = 5 tdLog.info('select * from %s where tgcol5 = 5' % (mt)) tdSql.query('select * from %s where tgcol5 = 5' % (mt)) @@ -1104,12 +1104,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 = '6' tdLog.info('select * from %s where tgcol6 = "6"' % (mt)) tdSql.query('select * from %s where tgcol6 = "6"' % (mt)) @@ -1117,12 +1117,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 = '0' tdLog.info('select * from %s where tgcol6 = "0"' % (mt)) tdSql.query('select * from %s where tgcol6 = "0"' % (mt)) @@ -1130,7 +1130,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step25 tdLog.info('=============== step25') @@ -1166,12 +1166,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 = '0' tdLog.info('select * from %s where tgcol6 = "0"' % (mt)) tdSql.query('select * from %s where tgcol6 = "0"' % (mt)) @@ -1179,7 +1179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step26 tdLog.info('=============== step26') @@ -1216,12 +1216,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = '0' tdLog.info('select * from %s where tgcol3 = "0"' % (mt)) tdSql.query('select * from %s where tgcol3 = "0"' % (mt)) @@ -1229,7 +1229,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step27 tdLog.info('=============== step27') @@ -1280,12 +1280,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step29 tdLog.info('=============== step29') @@ -1316,12 +1316,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step30 tdLog.info('=============== step30') @@ -1376,7 +1376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print $data00 $data01 $data02 tdLog.info('$data00 $data01 $data02') @@ -1384,7 +1384,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 2, "12345")') tdSql.checkData(0, 2, "12345") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/delete.py b/tests/pytest/tag_lite/delete.py index d4a55a4a75..88615e0406 100644 --- a/tests/pytest/tag_lite/delete.py +++ b/tests/pytest/tag_lite/delete.py @@ -77,22 +77,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -127,22 +127,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -177,22 +177,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -201,17 +201,17 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "BIGINT")') tdSql.checkDataType(2, 1, "BIGINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != FLOAT then tdLog.info('tdSql.checkDataType(3, 1, "FLOAT")') tdSql.checkDataType(3, 1, "FLOAT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != 1 then tdLog.info('tdSql.checkData(2, 3, 1)') tdSql.checkData(2, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol1 -x step40 tdLog.info('alter table %s drop tag tgcol1 -x step40' % (mt)) @@ -251,22 +251,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol1 -x step50 tdLog.info('alter table %s drop tag tgcol1 -x step50' % (mt)) @@ -306,27 +306,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -364,27 +364,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -393,47 +393,47 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "SMALLINT")') tdSql.checkDataType(2, 1, "SMALLINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != TINYINT then tdLog.info('tdSql.checkDataType(3, 1, "TINYINT")') tdSql.checkDataType(3, 1, "TINYINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data41 != BINARY then tdLog.info('tdSql.checkDataType(4, 1, "BINARY")') tdSql.checkDataType(4, 1, "BINARY") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data22 != 2 then tdLog.info('tdSql.checkData(2, 2, 2)') tdSql.checkData(2, 2, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data32 != 1 then tdLog.info('tdSql.checkData(3, 2, 1)') tdSql.checkData(3, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data42 != 10 then tdLog.info('tdSql.checkData(4, 2, 10)') tdSql.checkData(4, 2, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != 1 then tdLog.info('tdSql.checkData(2, 3, 1)') tdSql.checkData(2, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data33 != 2 then tdLog.info('tdSql.checkData(3, 3, 2)') tdSql.checkData(3, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data43 != 3 then tdLog.info('tdSql.checkData(4, 3, 3)') tdSql.checkData(4, 3, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -471,27 +471,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -531,27 +531,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 tdLog.info('alter table %s drop tag tgcol3' % (mt)) @@ -593,32 +593,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 tdLog.info('alter table %s drop tag tgcol3' % (mt)) @@ -663,37 +663,37 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.00000 then tdLog.info('tdSql.checkData(0, 5, 4.00000)') tdSql.checkData(0, 5, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -739,42 +739,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3.00000 then tdLog.info('tdSql.checkData(0, 4, 3.00000)') tdSql.checkData(0, 4, 3.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.000000000 then tdLog.info('tdSql.checkData(0, 5, 4.000000000)') tdSql.checkData(0, 5, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -823,42 +823,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 tdLog.info('alter table %s drop tag tgcol3' % (mt)) @@ -890,22 +890,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step2 tdLog.info('select * from %s where tgcol2 = 1 -x step2' % (mt)) @@ -931,22 +931,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step3 tdLog.info('select * from %s where tgcol2 = 1 -x step3' % (mt)) @@ -972,22 +972,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step4 tdLog.info('select * from %s where tgcol2 = 1 -x step4' % (mt)) @@ -1013,22 +1013,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '1' -x step5 tdLog.info('select * from %s where tgcol2 = "1" -x step5' % (mt)) @@ -1054,27 +1054,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step51 tdLog.info('select * from %s where tgcol2 = 1 -x step51' % (mt)) @@ -1105,27 +1105,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step71 tdLog.info('select * from %s where tgcol2 = 1 -x step71' % (mt)) @@ -1156,27 +1156,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step81 tdLog.info('select * from %s where tgcol2 = 1 -x step81' % (mt)) @@ -1207,27 +1207,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 1 -x step91 tdLog.info('select * from %s where tgcol3 = 1 -x step91' % (mt)) @@ -1258,32 +1258,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step101 tdLog.info('select * from %s where tgcol2 = 1 -x step101' % (mt)) @@ -1319,37 +1319,37 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != NULL then tdLog.info('tdSql.checkData(0, 6, NULL)') tdSql.checkData(0, 6, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step111 tdLog.info('select * from %s where tgcol2 = 1 -x step111' % (mt)) @@ -1385,42 +1385,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.000000000 then tdLog.info('tdSql.checkData(0, 3, 4.000000000)') tdSql.checkData(0, 3, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != NULL then tdLog.info('tdSql.checkData(0, 6, NULL)') tdSql.checkData(0, 6, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step120 tdLog.info('select * from %s where tgcol2 = 1 -x step120' % (mt)) @@ -1464,42 +1464,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5.000000000 then tdLog.info('tdSql.checkData(0, 4, 5.000000000)') tdSql.checkData(0, 4, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != NULL then tdLog.info('tdSql.checkData(0, 6, NULL)') tdSql.checkData(0, 6, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 1 -x step130 tdLog.info('select * from %s where tgcol3 = 1 -x step130' % (mt)) @@ -1583,7 +1583,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/double.py b/tests/pytest/tag_lite/double.py index f70c6871af..b1f29f592e 100644 --- a/tests/pytest/tag_lite/double.py +++ b/tests/pytest/tag_lite/double.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/filter.py b/tests/pytest/tag_lite/filter.py index cdba8964ef..aeb13a1715 100644 --- a/tests/pytest/tag_lite/filter.py +++ b/tests/pytest/tag_lite/filter.py @@ -120,7 +120,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tg = '1' -x @@ -162,12 +162,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data00 != 10 then tdLog.info('tdSql.checkData(0, 0, 10)') tdSql.checkData(0, 0, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -194,7 +194,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -263,7 +263,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -293,7 +293,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -313,7 +313,7 @@ class TDTestCase: # TSIM: print expect 100, actual $data00 tdLog.info('expect 100, actual $data00') # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -344,7 +344,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -358,7 +358,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/float.py b/tests/pytest/tag_lite/float.py index 1bfb1ac94d..7b93cb0ac9 100644 --- a/tests/pytest/tag_lite/float.py +++ b/tests/pytest/tag_lite/float.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/int.py b/tests/pytest/tag_lite/int.py index b831244790..99d4a69624 100644 --- a/tests/pytest/tag_lite/int.py +++ b/tests/pytest/tag_lite/int.py @@ -81,10 +81,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -107,10 +107,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -122,7 +122,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -130,7 +130,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -138,7 +138,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -146,7 +146,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -154,7 +154,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -166,7 +166,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -178,7 +178,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -188,7 +188,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -200,7 +200,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -213,7 +213,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -224,7 +224,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -233,7 +233,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -241,7 +241,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -249,7 +249,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -261,7 +261,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -272,7 +272,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -280,7 +280,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -288,7 +288,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -296,7 +296,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -304,7 +304,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -312,7 +312,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -320,7 +320,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -328,7 +328,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -341,7 +341,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -353,7 +353,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -363,7 +363,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -375,7 +375,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -387,7 +387,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -399,7 +399,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -412,7 +412,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -425,7 +425,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -443,7 +443,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -461,7 +461,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -479,7 +479,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -497,7 +497,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -516,7 +516,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -535,7 +535,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -555,7 +555,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -569,7 +569,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/int_binary.py b/tests/pytest/tag_lite/int_binary.py index 62d8f2a604..7760814f66 100644 --- a/tests/pytest/tag_lite/int_binary.py +++ b/tests/pytest/tag_lite/int_binary.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -122,7 +122,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -159,7 +159,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -170,7 +170,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -178,7 +178,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -186,7 +186,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -194,7 +194,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -202,7 +202,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -210,7 +210,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -218,7 +218,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -226,7 +226,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -237,7 +237,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '0' tdLog.info('select * from %s where tgcol2 <> "0"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "0"' % (mt)) @@ -245,7 +245,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = '1' tdLog.info('select * from %s where tgcol2 = "1"' % (mt)) tdSql.query('select * from %s where tgcol2 = "1"' % (mt)) @@ -253,7 +253,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '1' tdLog.info('select * from %s where tgcol2 <> "1"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "1"' % (mt)) @@ -261,7 +261,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -274,7 +274,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -286,7 +286,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -296,7 +296,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -308,7 +308,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -320,7 +320,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -332,7 +332,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -345,7 +345,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -358,7 +358,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -373,7 +373,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> "1"' % @@ -385,7 +385,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = "0"' % @@ -397,7 +397,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> "0"' % @@ -409,7 +409,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = "0"' % @@ -421,7 +421,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> "0"' % @@ -433,7 +433,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' tdLog.info( @@ -446,7 +446,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m tdLog.info( @@ -459,7 +459,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -475,7 +475,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and # tgcol <> 1 tdLog.info( @@ -488,7 +488,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and # tgcol = 0 tdLog.info( @@ -501,7 +501,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and # tgcol <> 0 tdLog.info( @@ -514,7 +514,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and # tgcol = 0 tdLog.info( @@ -527,7 +527,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' # and tgcol <> 0 tdLog.info( @@ -540,7 +540,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' and tgcol <> 0 tdLog.info( @@ -553,7 +553,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m and ts < now + 5m and tgcol <> 0 tdLog.info( @@ -566,7 +566,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -584,7 +584,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -602,7 +602,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -618,7 +618,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and @@ -635,7 +635,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -653,7 +653,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -671,7 +671,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -690,7 +690,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -707,7 +707,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and @@ -724,7 +724,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -744,7 +744,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -763,7 +763,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -777,7 +777,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/int_float.py b/tests/pytest/tag_lite/int_float.py index 8a544c6110..31c94130ab 100644 --- a/tests/pytest/tag_lite/int_float.py +++ b/tests/pytest/tag_lite/int_float.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -122,7 +122,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -159,7 +159,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -170,7 +170,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -178,7 +178,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -186,7 +186,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -194,7 +194,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -202,7 +202,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -210,7 +210,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -218,7 +218,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -226,7 +226,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -237,7 +237,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 < 0.5 tdLog.info('select * from %s where tgcol2 < 0.5' % (mt)) tdSql.query('select * from %s where tgcol2 < 0.5' % (mt)) @@ -245,7 +245,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 > 0.5 and tgcol2 < 1.5 tdLog.info( 'select * from %s where tgcol2 > 0.5 and tgcol2 < 1.5' % @@ -257,7 +257,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -265,7 +265,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % (mt)) tdSql.query('select * from %s where tgcol2 = 1' % (mt)) @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % (mt)) tdSql.query('select * from %s where tgcol2 <> 0' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -310,7 +310,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -322,7 +322,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -332,7 +332,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -344,7 +344,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -356,7 +356,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -368,7 +368,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -381,7 +381,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -394,7 +394,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -409,7 +409,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> 1' % @@ -421,7 +421,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = 0' % @@ -433,7 +433,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> 0' % @@ -445,7 +445,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = 0' % @@ -457,7 +457,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -469,7 +469,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -482,7 +482,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m tdLog.info( @@ -495,7 +495,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -511,7 +511,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and # tgcol <> 1 tdLog.info( @@ -524,7 +524,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and # tgcol = 0 tdLog.info( @@ -537,7 +537,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and # tgcol <> 0 tdLog.info( @@ -550,7 +550,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and # tgcol = 0 tdLog.info( @@ -563,7 +563,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and # tgcol <> 0 tdLog.info( @@ -576,7 +576,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol <> 0 tdLog.info( @@ -589,7 +589,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol <> 0 tdLog.info( @@ -602,7 +602,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -620,7 +620,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -638,7 +638,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 @@ -654,7 +654,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and @@ -671,7 +671,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -689,7 +689,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -707,7 +707,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -726,7 +726,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group @@ -743,7 +743,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and @@ -760,7 +760,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -780,7 +780,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -799,7 +799,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -813,7 +813,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/set.py b/tests/pytest/tag_lite/set.py index 44f5a0890d..2573600dc4 100644 --- a/tests/pytest/tag_lite/set.py +++ b/tests/pytest/tag_lite/set.py @@ -77,22 +77,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $tb set tag tagcx 1 -x step21 tdLog.info('alter table %s set tag tagcx 1 -x step21' % (tb)) @@ -119,22 +119,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 4 tdLog.info('select * from %s where tgcol2 = 4' % (mt)) @@ -145,22 +145,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -171,22 +171,22 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "BOOL")') tdSql.checkDataType(2, 1, "BOOL") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != INT then tdLog.info('tdSql.checkDataType(3, 1, "INT")') tdSql.checkDataType(3, 1, "INT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != false then tdLog.info('tdSql.checkData(2, 3, false)') tdSql.checkData(2, 3, false) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data33 != 4 then tdLog.info('tdSql.checkData(3, 3, 4)') tdSql.checkData(3, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -217,22 +217,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $tb set tag tgcol1=3 tdLog.info('alter table %s set tag tgcol1=3' % (tb)) @@ -254,22 +254,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3 then tdLog.info('tdSql.checkData(0, 2, 3)') tdSql.checkData(0, 2, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 4 tdLog.info('select * from %s where tgcol2 = 4' % (mt)) @@ -280,22 +280,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3 then tdLog.info('tdSql.checkData(0, 2, 3)') tdSql.checkData(0, 2, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 2 tdLog.info('select * from %s where tgcol2 = 2' % (mt)) @@ -304,7 +304,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step4 @@ -336,22 +336,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $tb set tag tgcol1=3 tdLog.info('alter table %s set tag tgcol1=3' % (tb)) @@ -373,22 +373,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3 then tdLog.info('tdSql.checkData(0, 2, 3)') tdSql.checkData(0, 2, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 4 tdLog.info('select * from %s where tgcol2 = 4' % (mt)) @@ -399,22 +399,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3 then tdLog.info('tdSql.checkData(0, 2, 3)') tdSql.checkData(0, 2, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step5 @@ -446,22 +446,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $tb set tag tgcol1=3 tdLog.info('alter table %s set tag tgcol1=3' % (tb)) @@ -483,22 +483,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3.000000000 then tdLog.info('tdSql.checkData(0, 2, 3.000000000)') tdSql.checkData(0, 2, 3.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '4' tdLog.info('select * from %s where tgcol2 = "4"' % (mt)) @@ -509,22 +509,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3.000000000 then tdLog.info('tdSql.checkData(0, 2, 3.000000000)') tdSql.checkData(0, 2, 3.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -560,42 +560,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 tdLog.info('alter table %s drop tag tgcol3' % (mt)) @@ -629,42 +629,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 8 tdLog.info('select * from %s where tgcol2 = 8' % (mt)) @@ -675,42 +675,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = '9' tdLog.info('select * from %s where tgcol4 = "9"' % (mt)) @@ -721,42 +721,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol5 = 10 tdLog.info('select * from %s where tgcol5 = 10' % (mt)) @@ -767,42 +767,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '11' tdLog.info('select * from %s where tgcol6 = "11"' % (mt)) @@ -813,42 +813,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -862,7 +862,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/smallint.py b/tests/pytest/tag_lite/smallint.py index a047b0afee..089af55a34 100644 --- a/tests/pytest/tag_lite/smallint.py +++ b/tests/pytest/tag_lite/smallint.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/tinyint.py b/tests/pytest/tag_lite/tinyint.py index 6e1820713c..55e33d013b 100644 --- a/tests/pytest/tag_lite/tinyint.py +++ b/tests/pytest/tag_lite/tinyint.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py index ea178baf93..e9f0dad076 100644 --- a/tests/pytest/util/dnodes.py +++ b/tests/pytest/util/dnodes.py @@ -99,6 +99,19 @@ class TDDnode: def setValgrind(self, value): self.valgrind = value + def getDataSize(self): + totalSize = 0 + + if (self.deployed == 1): + for dirpath, dirnames, filenames in os.walk(self.dataDir): + for f in filenames: + fp = os.path.join(dirpath, f) + + if not os.path.islink(fp): + totalSize = totalSize + os.path.getsize(fp) + + return totalSize + def deploy(self): self.logDir = "%s/pysim/dnode%d/log" % (self.path, self.index) self.dataDir = "%s/pysim/dnode%d/data" % (self.path, self.index) @@ -384,6 +397,10 @@ class TDDnodes: self.check(index) self.dnodes[index - 1].stop() + def getDataSize(self, index): + self.check(index) + return self.dnodes[index - 1].getDataSize() + def forcestop(self, index): self.check(index) self.dnodes[index - 1].forcestop() -- GitLab