fix:rm useless fileContent function
This commit is contained in:
parent
bf45ff56ca
commit
54a414a934
|
@ -24,7 +24,7 @@ class TDTestCase:
|
||||||
tdSql.init(conn.cursor(), True)
|
tdSql.init(conn.cursor(), True)
|
||||||
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
||||||
|
|
||||||
def checkFileContent(self, dbname="sml_db"):
|
def checkContent(self, dbname="sml_db"):
|
||||||
simClientCfg="%s/taos.cfg"%tdDnodes.getSimCfgPath()
|
simClientCfg="%s/taos.cfg"%tdDnodes.getSimCfgPath()
|
||||||
buildPath = tdCom.getBuildPath()
|
buildPath = tdCom.getBuildPath()
|
||||||
cmdStr = '%s/build/bin/sml_test %s'%(buildPath, simClientCfg)
|
cmdStr = '%s/build/bin/sml_test %s'%(buildPath, simClientCfg)
|
||||||
|
@ -102,7 +102,7 @@ class TDTestCase:
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
tdSql.prepare()
|
tdSql.prepare()
|
||||||
self.checkFileContent()
|
self.checkContent()
|
||||||
|
|
||||||
def stop(self):
|
def stop(self):
|
||||||
tdSql.close()
|
tdSql.close()
|
||||||
|
|
|
@ -32,34 +32,6 @@ class TDTestCase:
|
||||||
tdSql.init(conn.cursor())
|
tdSql.init(conn.cursor())
|
||||||
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
||||||
|
|
||||||
def checkFileContent(self, consumerId, queryString):
|
|
||||||
buildPath = tdCom.getBuildPath()
|
|
||||||
cfgPath = tdCom.getClientCfgPath()
|
|
||||||
dstFile = '%s/../log/dstrows_%d.txt'%(cfgPath, consumerId)
|
|
||||||
cmdStr = '%s/build/bin/taos -c %s -s "%s >> %s"'%(buildPath, cfgPath, queryString, dstFile)
|
|
||||||
tdLog.info(cmdStr)
|
|
||||||
os.system(cmdStr)
|
|
||||||
|
|
||||||
consumeRowsFile = '%s/../log/consumerid_%d.txt'%(cfgPath, consumerId)
|
|
||||||
tdLog.info("rows file: %s, %s"%(consumeRowsFile, dstFile))
|
|
||||||
|
|
||||||
consumeFile = open(consumeRowsFile, mode='r')
|
|
||||||
queryFile = open(dstFile, mode='r')
|
|
||||||
|
|
||||||
# skip first line for it is schema
|
|
||||||
queryFile.readline()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
dst = queryFile.readline()
|
|
||||||
src = consumeFile.readline()
|
|
||||||
|
|
||||||
if dst:
|
|
||||||
if dst != src:
|
|
||||||
tdLog.exit("consumerId %d consume rows is not match the rows by direct query"%consumerId)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
return
|
|
||||||
|
|
||||||
def prepareTestEnv(self):
|
def prepareTestEnv(self):
|
||||||
tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
|
tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
|
||||||
paraDict = {'dbName': 'dbt',
|
paraDict = {'dbName': 'dbt',
|
||||||
|
|
|
@ -228,7 +228,7 @@ class TDTestCase:
|
||||||
tdLog.exit("0 tmq consume rows error!")
|
tdLog.exit("0 tmq consume rows error!")
|
||||||
|
|
||||||
if expectRowsList[0] == resultList[0]:
|
if expectRowsList[0] == resultList[0]:
|
||||||
tqCom.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
for i in range(len(topicNameList)):
|
for i in range(len(topicNameList)):
|
||||||
|
|
|
@ -134,7 +134,7 @@ class TDTestCase:
|
||||||
# tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[2], resultList[0]))
|
# tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[2], resultList[0]))
|
||||||
# tdLog.exit("2 tmq consume rows error!")
|
# tdLog.exit("2 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
for i in range(len(topicNameList)):
|
for i in range(len(topicNameList)):
|
||||||
|
|
|
@ -21,34 +21,6 @@ class TDTestCase:
|
||||||
tdSql.init(conn.cursor())
|
tdSql.init(conn.cursor())
|
||||||
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
||||||
|
|
||||||
def checkFileContent(self, consumerId, queryString):
|
|
||||||
buildPath = tdCom.getBuildPath()
|
|
||||||
cfgPath = tdCom.getClientCfgPath()
|
|
||||||
dstFile = '%s/../log/dstrows_%d.txt'%(cfgPath, consumerId)
|
|
||||||
cmdStr = '%s/build/bin/taos -c %s -s "%s >> %s"'%(buildPath, cfgPath, queryString, dstFile)
|
|
||||||
tdLog.info(cmdStr)
|
|
||||||
os.system(cmdStr)
|
|
||||||
|
|
||||||
consumeRowsFile = '%s/../log/consumerid_%d.txt'%(cfgPath, consumerId)
|
|
||||||
tdLog.info("rows file: %s, %s"%(consumeRowsFile, dstFile))
|
|
||||||
|
|
||||||
consumeFile = open(consumeRowsFile, mode='r')
|
|
||||||
queryFile = open(dstFile, mode='r')
|
|
||||||
|
|
||||||
# skip first line for it is schema
|
|
||||||
queryFile.readline()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
dst = queryFile.readline()
|
|
||||||
src = consumeFile.readline()
|
|
||||||
|
|
||||||
if dst:
|
|
||||||
if dst != src:
|
|
||||||
tdLog.exit("consumerId %d consume rows is not match the rows by direct query"%consumerId)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
return
|
|
||||||
|
|
||||||
def tmqCase1(self):
|
def tmqCase1(self):
|
||||||
tdLog.printNoPrefix("======== test case 1: ")
|
tdLog.printNoPrefix("======== test case 1: ")
|
||||||
paraDict = {'dbName': 'db1',
|
paraDict = {'dbName': 'db1',
|
||||||
|
@ -109,7 +81,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
||||||
tdLog.exit("0 tmq consume rows error!")
|
tdLog.exit("0 tmq consume rows error!")
|
||||||
|
|
||||||
self.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
|
|
||||||
# reinit consume info, and start tmq_sim, then check consume result
|
# reinit consume info, and start tmq_sim, then check consume result
|
||||||
tmqCom.initConsumerTable()
|
tmqCom.initConsumerTable()
|
||||||
|
@ -134,7 +106,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
||||||
tdLog.exit("1 tmq consume rows error!")
|
tdLog.exit("1 tmq consume rows error!")
|
||||||
|
|
||||||
self.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
|
|
||||||
# reinit consume info, and start tmq_sim, then check consume result
|
# reinit consume info, and start tmq_sim, then check consume result
|
||||||
tmqCom.initConsumerTable()
|
tmqCom.initConsumerTable()
|
||||||
|
@ -159,7 +131,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[2], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[2], resultList[0]))
|
||||||
tdLog.exit("2 tmq consume rows error!")
|
tdLog.exit("2 tmq consume rows error!")
|
||||||
|
|
||||||
self.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
for i in range(len(topicNameList)):
|
for i in range(len(topicNameList)):
|
||||||
|
|
|
@ -21,34 +21,6 @@ class TDTestCase:
|
||||||
tdSql.init(conn.cursor())
|
tdSql.init(conn.cursor())
|
||||||
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
||||||
|
|
||||||
def checkFileContent(self, consumerId, queryString):
|
|
||||||
buildPath = tdCom.getBuildPath()
|
|
||||||
cfgPath = tdCom.getClientCfgPath()
|
|
||||||
dstFile = '%s/../log/dstrows_%d.txt'%(cfgPath, consumerId)
|
|
||||||
cmdStr = '%s/build/bin/taos -c %s -s "%s >> %s"'%(buildPath, cfgPath, queryString, dstFile)
|
|
||||||
tdLog.info(cmdStr)
|
|
||||||
os.system(cmdStr)
|
|
||||||
|
|
||||||
consumeRowsFile = '%s/../log/consumerid_%d.txt'%(cfgPath, consumerId)
|
|
||||||
tdLog.info("rows file: %s, %s"%(consumeRowsFile, dstFile))
|
|
||||||
|
|
||||||
consumeFile = open(consumeRowsFile, mode='r')
|
|
||||||
queryFile = open(dstFile, mode='r')
|
|
||||||
|
|
||||||
# skip first line for it is schema
|
|
||||||
queryFile.readline()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
dst = queryFile.readline()
|
|
||||||
src = consumeFile.readline()
|
|
||||||
|
|
||||||
if dst:
|
|
||||||
if dst != src:
|
|
||||||
tdLog.exit("consumerId %d consume rows is not match the rows by direct query"%consumerId)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
return
|
|
||||||
|
|
||||||
def tmqCase1(self):
|
def tmqCase1(self):
|
||||||
tdLog.printNoPrefix("======== test case 1: ")
|
tdLog.printNoPrefix("======== test case 1: ")
|
||||||
paraDict = {'dbName': 'db1',
|
paraDict = {'dbName': 'db1',
|
||||||
|
|
|
@ -60,34 +60,6 @@ class TDTestCase:
|
||||||
tdLog.exit("create udf functions fail")
|
tdLog.exit("create udf functions fail")
|
||||||
return
|
return
|
||||||
|
|
||||||
def checkFileContent(self, consumerId, queryString):
|
|
||||||
buildPath = tdCom.getBuildPath()
|
|
||||||
cfgPath = tdCom.getClientCfgPath()
|
|
||||||
dstFile = '%s/../log/dstrows_%d.txt'%(cfgPath, consumerId)
|
|
||||||
cmdStr = '%s/build/bin/taos -c %s -s "%s >> %s"'%(buildPath, cfgPath, queryString, dstFile)
|
|
||||||
tdLog.info(cmdStr)
|
|
||||||
os.system(cmdStr)
|
|
||||||
|
|
||||||
consumeRowsFile = '%s/../log/consumerid_%d.txt'%(cfgPath, consumerId)
|
|
||||||
tdLog.info("rows file: %s, %s"%(consumeRowsFile, dstFile))
|
|
||||||
|
|
||||||
consumeFile = open(consumeRowsFile, mode='r')
|
|
||||||
queryFile = open(dstFile, mode='r')
|
|
||||||
|
|
||||||
# skip first line for it is schema
|
|
||||||
queryFile.readline()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
dst = queryFile.readline()
|
|
||||||
src = consumeFile.readline()
|
|
||||||
|
|
||||||
if dst:
|
|
||||||
if dst != src:
|
|
||||||
tdLog.exit("consumerId %d consume rows is not match the rows by direct query"%consumerId)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
return
|
|
||||||
|
|
||||||
def prepareTestEnv(self):
|
def prepareTestEnv(self):
|
||||||
tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
|
tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
|
||||||
paraDict = {'dbName': 'dbt',
|
paraDict = {'dbName': 'dbt',
|
||||||
|
@ -199,7 +171,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
||||||
tdLog.exit("0 tmq consume rows error!")
|
tdLog.exit("0 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
# reinit consume info, and start tmq_sim, then check consume result
|
# reinit consume info, and start tmq_sim, then check consume result
|
||||||
|
@ -226,7 +198,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
||||||
tdLog.exit("1 tmq consume rows error!")
|
tdLog.exit("1 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
@ -309,7 +281,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
||||||
tdLog.exit("2 tmq consume rows error!")
|
tdLog.exit("2 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
# reinit consume info, and start tmq_sim, then check consume result
|
# reinit consume info, and start tmq_sim, then check consume result
|
||||||
|
@ -336,7 +308,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
||||||
tdLog.exit("3 tmq consume rows error!")
|
tdLog.exit("3 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
|
|
@ -60,34 +60,6 @@ class TDTestCase:
|
||||||
tdLog.exit("create udf functions fail")
|
tdLog.exit("create udf functions fail")
|
||||||
return
|
return
|
||||||
|
|
||||||
def checkFileContent(self, consumerId, queryString):
|
|
||||||
buildPath = tdCom.getBuildPath()
|
|
||||||
cfgPath = tdCom.getClientCfgPath()
|
|
||||||
dstFile = '%s/../log/dstrows_%d.txt'%(cfgPath, consumerId)
|
|
||||||
cmdStr = '%s/build/bin/taos -c %s -s "%s >> %s"'%(buildPath, cfgPath, queryString, dstFile)
|
|
||||||
tdLog.info(cmdStr)
|
|
||||||
os.system(cmdStr)
|
|
||||||
|
|
||||||
consumeRowsFile = '%s/../log/consumerid_%d.txt'%(cfgPath, consumerId)
|
|
||||||
tdLog.info("rows file: %s, %s"%(consumeRowsFile, dstFile))
|
|
||||||
|
|
||||||
consumeFile = open(consumeRowsFile, mode='r')
|
|
||||||
queryFile = open(dstFile, mode='r')
|
|
||||||
|
|
||||||
# skip first line for it is schema
|
|
||||||
queryFile.readline()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
dst = queryFile.readline()
|
|
||||||
src = consumeFile.readline()
|
|
||||||
|
|
||||||
if dst:
|
|
||||||
if dst != src:
|
|
||||||
tdLog.exit("consumerId %d consume rows is not match the rows by direct query"%consumerId)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
return
|
|
||||||
|
|
||||||
def prepareTestEnv(self):
|
def prepareTestEnv(self):
|
||||||
tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
|
tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
|
||||||
paraDict = {'dbName': 'dbt',
|
paraDict = {'dbName': 'dbt',
|
||||||
|
@ -199,7 +171,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
||||||
tdLog.exit("0 tmq consume rows error!")
|
tdLog.exit("0 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
# reinit consume info, and start tmq_sim, then check consume result
|
# reinit consume info, and start tmq_sim, then check consume result
|
||||||
|
@ -226,7 +198,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
||||||
tdLog.exit("1 tmq consume rows error!")
|
tdLog.exit("1 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
@ -309,7 +281,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
||||||
tdLog.exit("2 tmq consume rows error!")
|
tdLog.exit("2 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
# reinit consume info, and start tmq_sim, then check consume result
|
# reinit consume info, and start tmq_sim, then check consume result
|
||||||
|
@ -336,7 +308,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
||||||
tdLog.exit("3 tmq consume rows error!")
|
tdLog.exit("3 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
# tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
|
|
@ -60,34 +60,6 @@ class TDTestCase:
|
||||||
tdLog.exit("create udf functions fail")
|
tdLog.exit("create udf functions fail")
|
||||||
return
|
return
|
||||||
|
|
||||||
def checkFileContent(self, consumerId, queryString):
|
|
||||||
buildPath = tdCom.getBuildPath()
|
|
||||||
cfgPath = tdCom.getClientCfgPath()
|
|
||||||
dstFile = '%s/../log/dstrows_%d.txt'%(cfgPath, consumerId)
|
|
||||||
cmdStr = '%s/build/bin/taos -c %s -s "%s >> %s"'%(buildPath, cfgPath, queryString, dstFile)
|
|
||||||
tdLog.info(cmdStr)
|
|
||||||
os.system(cmdStr)
|
|
||||||
|
|
||||||
consumeRowsFile = '%s/../log/consumerid_%d.txt'%(cfgPath, consumerId)
|
|
||||||
tdLog.info("rows file: %s, %s"%(consumeRowsFile, dstFile))
|
|
||||||
|
|
||||||
consumeFile = open(consumeRowsFile, mode='r')
|
|
||||||
queryFile = open(dstFile, mode='r')
|
|
||||||
|
|
||||||
# skip first line for it is schema
|
|
||||||
queryFile.readline()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
dst = queryFile.readline()
|
|
||||||
src = consumeFile.readline()
|
|
||||||
|
|
||||||
if dst:
|
|
||||||
if dst != src:
|
|
||||||
tdLog.exit("consumerId %d consume rows is not match the rows by direct query"%consumerId)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
return
|
|
||||||
|
|
||||||
def prepareTestEnv(self):
|
def prepareTestEnv(self):
|
||||||
tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
|
tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
|
||||||
paraDict = {'dbName': 'dbt',
|
paraDict = {'dbName': 'dbt',
|
||||||
|
@ -199,7 +171,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
||||||
tdLog.exit("0 tmq consume rows error!")
|
tdLog.exit("0 tmq consume rows error!")
|
||||||
|
|
||||||
self.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
|
|
||||||
|
@ -227,7 +199,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
||||||
tdLog.exit("1 tmq consume rows error!")
|
tdLog.exit("1 tmq consume rows error!")
|
||||||
|
|
||||||
self.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
@ -310,7 +282,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
||||||
tdLog.exit("2 tmq consume rows error!")
|
tdLog.exit("2 tmq consume rows error!")
|
||||||
|
|
||||||
self.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
# reinit consume info, and start tmq_sim, then check consume result
|
# reinit consume info, and start tmq_sim, then check consume result
|
||||||
|
@ -337,7 +309,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
||||||
tdLog.exit("3 tmq consume rows error!")
|
tdLog.exit("3 tmq consume rows error!")
|
||||||
|
|
||||||
self.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
tdLog.printNoPrefix("consumerId %d check data ok!"%(consumerId))
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
|
|
@ -21,34 +21,6 @@ class TDTestCase:
|
||||||
tdSql.init(conn.cursor())
|
tdSql.init(conn.cursor())
|
||||||
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
#tdSql.init(conn.cursor(), logSql) # output sql.txt file
|
||||||
|
|
||||||
def checkFileContent(self, consumerId, queryString):
|
|
||||||
buildPath = tdCom.getBuildPath()
|
|
||||||
cfgPath = tdCom.getClientCfgPath()
|
|
||||||
dstFile = '%s/../log/dstrows_%d.txt'%(cfgPath, consumerId)
|
|
||||||
cmdStr = '%s/build/bin/taos -c %s -s "%s >> %s"'%(buildPath, cfgPath, queryString, dstFile)
|
|
||||||
tdLog.info(cmdStr)
|
|
||||||
os.system(cmdStr)
|
|
||||||
|
|
||||||
consumeRowsFile = '%s/../log/consumerid_%d.txt'%(cfgPath, consumerId)
|
|
||||||
tdLog.info("rows file: %s, %s"%(consumeRowsFile, dstFile))
|
|
||||||
|
|
||||||
consumeFile = open(consumeRowsFile, mode='r')
|
|
||||||
queryFile = open(dstFile, mode='r')
|
|
||||||
|
|
||||||
# skip first line for it is schema
|
|
||||||
queryFile.readline()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
dst = queryFile.readline()
|
|
||||||
src = consumeFile.readline()
|
|
||||||
|
|
||||||
if dst:
|
|
||||||
if dst != src:
|
|
||||||
tdLog.exit("consumerId %d consume rows is not match the rows by direct query"%consumerId)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
return
|
|
||||||
|
|
||||||
def tmqCase1(self):
|
def tmqCase1(self):
|
||||||
tdLog.printNoPrefix("======== test case 1: ")
|
tdLog.printNoPrefix("======== test case 1: ")
|
||||||
paraDict = {'dbName': 'db1',
|
paraDict = {'dbName': 'db1',
|
||||||
|
@ -113,7 +85,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[0], resultList[0]))
|
||||||
tdLog.exit("0 tmq consume rows error!")
|
tdLog.exit("0 tmq consume rows error!")
|
||||||
|
|
||||||
self.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
|
|
||||||
# reinit consume info, and start tmq_sim, then check consume result
|
# reinit consume info, and start tmq_sim, then check consume result
|
||||||
tmqCom.initConsumerTable()
|
tmqCom.initConsumerTable()
|
||||||
|
@ -139,7 +111,7 @@ class TDTestCase:
|
||||||
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[1], resultList[0]))
|
||||||
tdLog.exit("1 tmq consume rows error!")
|
tdLog.exit("1 tmq consume rows error!")
|
||||||
|
|
||||||
self.checkFileContent(consumerId, queryString)
|
tmqCom.checkFileContent(consumerId, queryString)
|
||||||
|
|
||||||
# reinit consume info, and start tmq_sim, then check consume result
|
# reinit consume info, and start tmq_sim, then check consume result
|
||||||
tmqCom.initConsumerTable()
|
tmqCom.initConsumerTable()
|
||||||
|
@ -165,7 +137,7 @@ class TDTestCase:
|
||||||
# tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[2], resultList[0]))
|
# tdLog.info("expect consume rows: %d, act consume rows: %d"%(expectRowsList[2], resultList[0]))
|
||||||
# tdLog.exit("2 tmq consume rows error!")
|
# tdLog.exit("2 tmq consume rows error!")
|
||||||
|
|
||||||
# self.checkFileContent(consumerId, queryString)
|
# tmqCom.checkFileContent(consumerId, queryString)
|
||||||
|
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
for i in range(len(topicNameList)):
|
for i in range(len(topicNameList)):
|
||||||
|
|
Loading…
Reference in New Issue