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

fix dict error

This commit is contained in:
liuyq-617 2021-01-11 18:42:31 +08:00
parent b66428c33b
commit 5746eb5c65
8 changed files with 278 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/pytest/multilevel/basic.py
View File

@ -30,12 +30,15 @@ class TDTestCase:
self.startTime = 1520000010000
tdDnodes.stop(1)
print('-'*40)
cfg={
'dataDir': '/mnt/data1',
'dataDir': '/mnt/data2 0 0'
'/mnt/data1' : 'dataDir',
'/mnt/data2 0 0' : 'dataDir'
}
print('*'*40)
tdSql.createDir('/mnt/data1')
tdSql.createDir('/mnt/data2')
print('+'*40)
tdDnodes.deploy(1,cfg)
tdDnodes.startWithoutSleep(1)

49
tests/pytest/multilevel/dirNotExist.py Normal file
View File

@ -0,0 +1,49 @@
###################################################################
# 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
import taos
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):
self.ntables = 10
self.rowsPerTable = 10
self.startTime = 1520000010000
tdDnodes.stop(1)
cfg={
'dataDir': '/mnt/data1 0 0 ',
'dataDir': '/mnt/data2 0 0'
}
tdSql.createDir('/mnt/data1')
tdDnodes.deploy(1,cfg)
tdDnodes.startWithoutSleep(1)
tdSql.taosdStatus(0)
def stop(self):
tdSql.close()
tdLog.success("%s successfully executed" % __file__)
tdCases.addWindows(__file__, TDTestCase())
tdCases.addLinux(__file__, TDTestCase())

80
tests/pytest/multilevel/moreThan16disks.py Normal file
View File

@ -0,0 +1,80 @@
###################################################################
# 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
import taos
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):
self.ntables = 10
self.rowsPerTable = 10
self.startTime = 1520000010000
tdDnodes.stop(1)
cfg={
'dataDir': '/mnt/data1 0 0',
'dataDir': '/mnt/data2 0 0',
'dataDir': '/mnt/data3 0 0',
'dataDir': '/mnt/data4 0 0',
'dataDir': '/mnt/data5 0 0',
'dataDir': '/mnt/data6 0 0',
'dataDir': '/mnt/data7 0 0',
'dataDir': '/mnt/data8 0 0',
'dataDir': '/mnt/data9 0 0',
'dataDir': '/mnt/data10 0 0',
'dataDir': '/mnt/data11 0 0',
'dataDir': '/mnt/data12 0 0',
'dataDir': '/mnt/data13 0 0',
'dataDir': '/mnt/data14 0 0',
'dataDir': '/mnt/data15 0 0',
'dataDir': '/mnt/data16 0 0',
'dataDir': '/mnt/data17 0 0'
}
tdSql.createDir('/mnt/data1')
tdSql.createDir('/mnt/data2')
tdSql.createDir('/mnt/data3')
tdSql.createDir('/mnt/data4')
tdSql.createDir('/mnt/data5')
tdSql.createDir('/mnt/data6')
tdSql.createDir('/mnt/data7')
tdSql.createDir('/mnt/data8')
tdSql.createDir('/mnt/data9')
tdSql.createDir('/mnt/data10')
tdSql.createDir('/mnt/data11')
tdSql.createDir('/mnt/data12')
tdSql.createDir('/mnt/data13')
tdSql.createDir('/mnt/data14')
tdSql.createDir('/mnt/data15')
tdSql.createDir('/mnt/data16')
tdSql.createDir('/mnt/data17')
tdDnodes.deploy(1,cfg)
tdDnodes.startWithoutSleep(1)
tdSql.taosdStatus(0)
def stop(self):
tdSql.close()
tdLog.success("%s successfully executed" % __file__)
tdCases.addWindows(__file__, TDTestCase())
tdCases.addLinux(__file__, TDTestCase())

50
tests/pytest/multilevel/multiMainMountPoint.py Normal file
View File

@ -0,0 +1,50 @@
###################################################################
# 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
import taos
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):
self.ntables = 10
self.rowsPerTable = 10
self.startTime = 1520000010000
tdDnodes.stop(1)
cfg={
'dataDir': '/mnt/data1',
'dataDir': '/mnt/data2'
}
tdSql.createDir('/mnt/data1')
tdSql.createDir('/mnt/data2')
tdDnodes.deploy(1,cfg)
tdDnodes.startWithoutSleep(1)
tdSql.taosdStatus(0)
def stop(self):
tdSql.close()
tdLog.success("%s successfully executed" % __file__)
tdCases.addWindows(__file__, TDTestCase())
tdCases.addLinux(__file__, TDTestCase())

50
tests/pytest/multilevel/noneMainMountPoint.py Normal file
View File

@ -0,0 +1,50 @@
###################################################################
# 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
import taos
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):
self.ntables = 10
self.rowsPerTable = 10
self.startTime = 1520000010000
tdDnodes.stop(1)
cfg={
'dataDir': '/mnt/data1 0 0',
'dataDir': '/mnt/data2 0 0'
}
tdSql.createDir('/mnt/data1')
tdSql.createDir('/mnt/data2')
tdDnodes.deploy(1,cfg)
tdDnodes.startWithoutSleep(1)
tdSql.taosdStatus(0)
def stop(self):
tdSql.close()
tdLog.success("%s successfully executed" % __file__)
tdCases.addWindows(__file__, TDTestCase())
tdCases.addLinux(__file__, TDTestCase())

20
tests/pytest/multilevel/tt.py Normal file
View File

@ -0,0 +1,20 @@
cfg={
'/mnt/data1 0 0': 'dataDir' ,
'dataDir': '/mnt/data2 0 0',
'dataDir': '/mnt/data3 0 0',
'dataDir': '/mnt/data4 0 0',
'dataDir': '/mnt/data5 0 0',
'dataDir': '/mnt/data6 0 0',
'dataDir': '/mnt/data7 0 0',
'dataDir': '/mnt/data8 0 0',
'dataDir': '/mnt/data9 0 0',
'dataDir': '/mnt/data10 0 0',
'dataDir': '/mnt/data11 0 0',
'dataDir': '/mnt/data12 0 0',
'dataDir': '/mnt/data13 0 0',
'dataDir': '/mnt/data14 0 0',
'dataDir': '/mnt/data15 0 0',
'dataDir': '/mnt/data16 0 0',
'dataDir': '/mnt/data17 0 0'
}
print(cfg)

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

@ -208,14 +208,24 @@ class TDDnode:
self.cfg("publicIp", "192.168.0.%d" % (self.index))
self.cfg("internalIp", "192.168.0.%d" % (self.index))
self.cfg("privateIp", "192.168.0.%d" % (self.index))
self.cfg("dataDir",self.dataDir)
self.cfg("logDir",self.logDir)
self.cfgDict["dataDir"] = self.dataDir
self.cfgDict["logDir"] = self.logDir
# self.cfg("dataDir",self.dataDir)
# self.cfg("logDir",self.logDir)
print(updatecfgDict)
isFirstDir = 1
if updatecfgDict[0] and updatecfgDict[0][0]:
print(updatecfgDict[0][0])
for key,value in updatecfgDict[0][0].items():
self.addExtraCfg(key,value)
if value == 'dataDir' :
if isFirstDir:
self.cfgDict.pop('dataDir')
self.cfg(value,key)
isFirstDir = 0
else:
self.cfg(value,key)
else:
self.addExtraCfg(key,value)
for key, value in self.cfgDict.items():
self.cfg(key, value)

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

@ -199,33 +199,33 @@ class TDSql:
break
if loop:break
time.sleep(5)
args=(pstate,state)
if pstate == state:
tdLog.info("taosd state is %d == expect:%d",pstate,state)
tdLog.info("taosd state is %d == expect:%d" %args)
else:
tdLog.exit("taosd state is %d != expect:%d" ,pstate,state)
tdLog.exit("taosd state is %d != expect:%d" %args)
pass
def haveFile(self, dir, state):
if os.path.exists(dir) and os.path.isdir(dir):
if not os.listdir(dir):
if state :
tdLog.exit("dir: %s is empty, expect: not empty" ,dir)
tdLog.exit("dir: %s is empty, expect: not empty" %dir)
else:
tdLog.info("dir: %s is empty, expect: empty" ,dir)
tdLog.info("dir: %s is empty, expect: empty" %dir)
else:
if state :
tdLog.info("dir: %s is empty, expect: not empty" ,dir)
tdLog.info("dir: %s is empty, expect: not empty" %dir)
else:
tdLog.exit("dir: %s is empty, expect: empty" ,dir)
tdLog.exit("dir: %s is empty, expect: empty" %dir)
else:
tdLog.exit("dir: %s doesn't exist" ,dir)
tdLog.exit("dir: %s doesn't exist" %dir)
def createDir(self, dir):
if os.path.exists(dir):
shutil.rmtree(dir)
tdLog.info("dir: %s is removed" ,dir)
tdLog.info("dir: %s is removed" %dir)
os.makedirs( dir, 755 )
tdLog.info("dir: %s is created" ,dir)
tdLog.info("dir: %s is created" %dir)
pass
tdSql = TDSql()