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

for pass pytest

This commit is contained in:
liu0x54 2020-06-16 10:08:49 +00:00
parent bbba154108
commit 654f5aad26
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/pytest/random-test/random-test.py
View File

@ -17,6 +17,7 @@ from util.log import *
from util.cases import * from util.cases import *
from util.sql import * from util.sql import *
from util.dnodes import * from util.dnodes import *
import codecs
class Test: class Test:
@ -93,13 +94,11 @@ class Test:
self.last_stb = current_stb self.last_stb = current_stb
current_tb = "tb%d" % int(round(time.time() * 1000)) current_tb = "tb%d" % int(round(time.time() * 1000))
tdSql.execute( sqlcmd = "create table %s using %s tags (1, 'test')" %(current_tb, self.last_stb)
"create table %s using %s tags (1, '表1')" % tdSql.execute(sqlcmd)
(current_tb, self.last_stb))
self.last_tb = current_tb self.last_tb = current_tb
tdSql.execute( sqlcmd = "insert into %s values (now, 27, 'testnchar')" % self.last_tb
"insert into %s values (now, 27, '我是nchar字符串')" % tdSql.execute(sqlcmd)
self.last_tb)
self.written = self.written + 1 self.written = self.written + 1
def drop_stable(self): def drop_stable(self):

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

@ -40,10 +40,18 @@ class TDSql:
def prepare(self): def prepare(self):
tdLog.info("prepare database:db") tdLog.info("prepare database:db")
self.cursor.execute('reset query cache') s = 'reset query cache'
self.cursor.execute('drop database if exists db') print(s)
self.cursor.execute('create database db') self.cursor.execute(s)
self.cursor.execute('use db') s = 'drop database if exists db'
print(s)
self.cursor.execute(s)
s = 'create database db'
print(s)
self.cursor.execute(s)
s = 'use db'
print(s)
self.cursor.execute(s)
def error(self, sql): def error(self, sql):
expectErrNotOccured = True expectErrNotOccured = True
@ -66,6 +74,7 @@ class TDSql:
def query(self, sql): def query(self, sql):
self.sql = sql self.sql = sql
print(sql)
self.cursor.execute(sql) self.cursor.execute(sql)
self.queryResult = self.cursor.fetchall() self.queryResult = self.cursor.fetchall()
self.queryRows = len(self.queryResult) self.queryRows = len(self.queryResult)
@ -182,6 +191,7 @@ class TDSql:
def execute(self, sql): def execute(self, sql):
self.sql = sql self.sql = sql
print(sql)
self.affectedRows = self.cursor.execute(sql) self.affectedRows = self.cursor.execute(sql)
return self.affectedRows return self.affectedRows