Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
706aba2d
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
706aba2d
编写于
4月 27, 2022
作者:
H
Hui Li
提交者:
GitHub
4月 27, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #11902 from taosdata/xiaoping/2.4
test: add client config for test cases
上级
2f30f91b
7d859793
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
2 deletion
+13
-2
tests/pytest/util/dnodes.py
tests/pytest/util/dnodes.py
+13
-2
未找到文件。
tests/pytest/util/dnodes.py
浏览文件 @
706aba2d
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录