Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
adminstrot
TDengine
提交
3aa302e7
TDengine
项目概览
adminstrot
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
3aa302e7
编写于
8月 17, 2021
作者:
H
Hui Li
提交者:
GitHub
8月 17, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7399 from taosdata/test/py_test_modify
reduce python case execution time
上级
a6df415b
0701a7b5
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
17 addition
and
13 deletion
+17
-13
tests/pytest/client/client.py
tests/pytest/client/client.py
+1
-1
tests/pytest/fulltest.sh
tests/pytest/fulltest.sh
+2
-1
tests/pytest/test.py
tests/pytest/test.py
+1
-2
tests/pytest/util/dnodes.py
tests/pytest/util/dnodes.py
+3
-3
tests/script/jenkins/basic.txt
tests/script/jenkins/basic.txt
+7
-6
tests/test-all.sh
tests/test-all.sh
+3
-0
未找到文件。
tests/pytest/client/client.py
浏览文件 @
3aa302e7
...
...
@@ -67,7 +67,7 @@ class TDTestCase:
tdSql
.
execute
(
'create table ct1 using st tags(1)'
);
tdSql
.
execute
(
'create table ct2 using st tags(2)'
);
time
.
sleep
(
1
)
time
.
sleep
(
3
)
ret
=
tdSql
.
query
(
'show vnodes "{}"'
.
format
(
dnodeEndpoint
))
tdSql
.
checkRows
(
1
)
...
...
tests/pytest/fulltest.sh
浏览文件 @
3aa302e7
...
...
@@ -155,6 +155,7 @@ python3 ./test.py -f import_merge/importCSV.py
python3 ./test.py
-f
import_merge/import_update_0.py
python3 ./test.py
-f
import_merge/import_update_1.py
python3 ./test.py
-f
import_merge/import_update_2.py
python3 ./test.py
-f
update/merge_commit_data.py
#======================p1-end===============
#======================p2-start===============
# tools
...
...
@@ -183,7 +184,7 @@ python3 ./test.py -f update/allow_update-0.py
python3 ./test.py
-f
update/append_commit_data.py
python3 ./test.py
-f
update/append_commit_last-0.py
python3 ./test.py
-f
update/append_commit_last.py
python3 ./test.py
-f
update/merge_commit_data.py
python3 ./test.py
-f
update/merge_commit_data2.py
python3 ./test.py
-f
update/merge_commit_data2_update0.py
...
...
tests/pytest/test.py
浏览文件 @
3aa302e7
...
...
@@ -87,7 +87,7 @@ if __name__ == "__main__":
else
:
toBeKilled
=
"valgrind.bin"
killCmd
=
"ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -
HUP
> /dev/null 2>&1"
%
toBeKilled
killCmd
=
"ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -
TERM
> /dev/null 2>&1"
%
toBeKilled
psCmd
=
"ps -ef|grep -w %s| grep -v grep | awk '{print $2}'"
%
toBeKilled
processID
=
subprocess
.
check_output
(
psCmd
,
shell
=
True
)
...
...
@@ -110,7 +110,6 @@ if __name__ == "__main__":
time
.
sleep
(
2
)
tdLog
.
info
(
'stop All dnodes'
)
sys
.
exit
(
0
)
tdDnodes
.
init
(
deployPath
)
tdDnodes
.
setTestCluster
(
testCluster
)
...
...
tests/pytest/util/dnodes.py
浏览文件 @
3aa302e7
...
...
@@ -436,7 +436,7 @@ class TDDnodes:
psCmd
=
"ps -ef|grep -w taosd| grep -v grep| grep -v defunct | awk '{print $2}'"
processID
=
subprocess
.
check_output
(
psCmd
,
shell
=
True
).
decode
(
"utf-8"
)
while
(
processID
):
killCmd
=
"kill -
TERM
%s > /dev/null 2>&1"
%
processID
killCmd
=
"kill -
9
%s > /dev/null 2>&1"
%
processID
os
.
system
(
killCmd
)
time
.
sleep
(
1
)
processID
=
subprocess
.
check_output
(
...
...
@@ -445,7 +445,7 @@ class TDDnodes:
psCmd
=
"ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
processID
=
subprocess
.
check_output
(
psCmd
,
shell
=
True
).
decode
(
"utf-8"
)
while
(
processID
):
killCmd
=
"kill -
TERM
%s > /dev/null 2>&1"
%
processID
killCmd
=
"kill -
9
%s > /dev/null 2>&1"
%
processID
os
.
system
(
killCmd
)
time
.
sleep
(
1
)
processID
=
subprocess
.
check_output
(
...
...
@@ -556,7 +556,7 @@ class TDDnodes:
psCmd
=
"ps -ef|grep -w taosd| grep -v grep| grep -v defunct | awk '{print $2}'"
processID
=
subprocess
.
check_output
(
psCmd
,
shell
=
True
).
decode
(
"utf-8"
)
while
(
processID
):
killCmd
=
"kill -
TERM
%s > /dev/null 2>&1"
%
processID
killCmd
=
"kill -
9
%s > /dev/null 2>&1"
%
processID
os
.
system
(
killCmd
)
time
.
sleep
(
1
)
processID
=
subprocess
.
check_output
(
...
...
tests/script/jenkins/basic.txt
浏览文件 @
3aa302e7
...
...
@@ -134,6 +134,13 @@ cd ../../../debug; make
./test.sh -f unique/cluster/alter.sim
./test.sh -f unique/cluster/cache.sim
./test.sh -f unique/http/admin.sim
./test.sh -f unique/http/opentsdb.sim
./test.sh -f unique/import/replica2.sim
./test.sh -f unique/import/replica3.sim
./test.sh -f general/alter/cached_schema_after_alter.sim
#======================b2-end===============
...
...
@@ -198,13 +205,7 @@ cd ../../../debug; make
#======================b3-end===============
#======================b4-start===============
./test.sh -f unique/http/admin.sim
./test.sh -f unique/http/opentsdb.sim
./test.sh -f unique/import/replica2.sim
./test.sh -f unique/import/replica3.sim
./test.sh -f general/alter/cached_schema_after_alter.sim
./test.sh -f general/alter/count.sim
./test.sh -f general/alter/dnode.sim
./test.sh -f general/alter/import.sim
...
...
tests/test-all.sh
浏览文件 @
3aa302e7
...
...
@@ -179,6 +179,9 @@ function runPyCaseOneByOnefq() {
start_time
=
`
date
+%s
`
date
+%F
\
%T
|
tee
-a
pytest-out.log
echo
-n
$case
if
[[
$1
=
~ full
]]
;
then
line
=
$line
" -s"
fi
$line
>
case
.log 2>&1
&&
\
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
pytest-out.log
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
pytest-out.log
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录