未验证 提交 706aba2d 编写于 作者: H Hui Li 提交者: GitHub

Merge pull request #11902 from taosdata/xiaoping/2.4

test: add client config for test cases
...@@ -70,7 +70,7 @@ class TDSimClient: ...@@ -70,7 +70,7 @@ class TDSimClient:
os_path = path.replace("/", os.sep) os_path = path.replace("/", os.sep)
return os_path return os_path
def deploy(self): def deploy(self, *updatecfgDict):
self.logDir = self.os_string("%s/sim/psim/log" % (self.path)) self.logDir = self.os_string("%s/sim/psim/log" % (self.path))
self.cfgDir = self.os_string("%s/sim/psim/cfg" % (self.path)) self.cfgDir = self.os_string("%s/sim/psim/cfg" % (self.path))
self.cfgPath = self.os_string("%s/sim/psim/cfg/taos.cfg" % (self.path)) self.cfgPath = self.os_string("%s/sim/psim/cfg/taos.cfg" % (self.path))
...@@ -113,6 +113,15 @@ class TDSimClient: ...@@ -113,6 +113,15 @@ class TDSimClient:
for key, value in self.cfgDict.items(): for key, value in self.cfgDict.items():
self.cfg(key, value) self.cfg(key, value)
try:
if updatecfgDict and updatecfgDict[0] and updatecfgDict[0][0]:
clientCfg = dict (updatecfgDict[0][0].get('clientCfg'))
if clientCfg is not None:
for key, value in clientCfg.items():
self.cfg(key, value)
except Exception as e:
pass
tdLog.debug("psim is deployed and configured by %s" % (self.cfgPath)) tdLog.debug("psim is deployed and configured by %s" % (self.cfgPath))
...@@ -230,6 +239,8 @@ class TDDnode: ...@@ -230,6 +239,8 @@ class TDDnode:
if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]: if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]:
print(updatecfgDict[0][0]) print(updatecfgDict[0][0])
for key, value in updatecfgDict[0][0].items(): for key, value in updatecfgDict[0][0].items():
if key == "clientCfg":
continue
if value == 'dataDir': if value == 'dataDir':
if isFirstDir: if isFirstDir:
self.cfgDict.pop('dataDir') self.cfgDict.pop('dataDir')
...@@ -605,7 +616,7 @@ class TDDnodes: ...@@ -605,7 +616,7 @@ class TDDnodes:
self.sim.setTestCluster(self.testCluster) self.sim.setTestCluster(self.testCluster)
if (self.simDeployed == False): if (self.simDeployed == False):
self.sim.deploy() self.sim.deploy(updatecfgDict)
self.simDeployed = True self.simDeployed = True
self.check(index) self.check(index)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册