Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lzh_me
TDengine
提交
3e246468
TDengine
项目概览
lzh_me
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
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,发现更多精彩内容 >>
未验证
提交
3e246468
编写于
3月 22, 2021
作者:
H
huili
提交者:
GitHub
3月 22, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5523 from taosdata/test/testcase
[TD-3368]<test>output log of failed case
上级
2abe9bfd
d354ce2e
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
29 addition
and
10 deletion
+29
-10
tests/pytest/cluster/clusterEnvSetup/Dockerfile
tests/pytest/cluster/clusterEnvSetup/Dockerfile
+2
-0
tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
+1
-0
tests/pytest/cluster/clusterEnvSetup/docker-compose.yml
tests/pytest/cluster/clusterEnvSetup/docker-compose.yml
+3
-1
tests/pytest/cluster/clusterEnvSetup/node3.yml
tests/pytest/cluster/clusterEnvSetup/node3.yml
+3
-1
tests/pytest/cluster/clusterEnvSetup/node4.yml
tests/pytest/cluster/clusterEnvSetup/node4.yml
+3
-1
tests/pytest/cluster/clusterEnvSetup/node5.yml
tests/pytest/cluster/clusterEnvSetup/node5.yml
+3
-1
tests/test-all.sh
tests/test-all.sh
+14
-6
未找到文件。
tests/pytest/cluster/clusterEnvSetup/Dockerfile
浏览文件 @
3e246468
...
...
@@ -28,6 +28,8 @@ RUN ulimit -c unlimited
COPY
--from=builder /root/bin/taosd /usr/bin
COPY
--from=builder /root/bin/tarbitrator /usr/bin
COPY
--from=builder /root/bin/taosdemo /usr/bin
COPY
--from=builder /root/bin/taosdump /usr/bin
COPY
--from=builder /root/bin/taos /usr/bin
COPY
--from=builder /root/cfg/taos.cfg /etc/taos/
COPY
--from=builder /root/lib/libtaos.so.* /usr/lib/libtaos.so.1
...
...
tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
浏览文件 @
3e246468
...
...
@@ -141,6 +141,7 @@ function clusterUp {
sed
-i
"s/td2.0-node3/td2.0-node
$i
/g"
node
$i
.yml
sed
-i
"s/'tdnode3'/'tdnode
$i
'/g"
node
$i
.yml
sed
-i
"s#/node3/#/node
$i
/#g"
node
$i
.yml
sed
-i
"s#hostname: tdnode3#hostname: tdnode
$i
#g"
node
$i
.yml
sed
-i
"s#ipv4_address: 172.27.0.9#ipv4_address: 172.27.0.
`
expr
$i
+ 6
`
#g"
node
$i
.yml
fi
docker_run
=
$docker_run
" -f node
$i
.yml "
...
...
tests/pytest/cluster/clusterEnvSetup/docker-compose.yml
浏览文件 @
3e246468
...
...
@@ -34,7 +34,7 @@ services:
-
"
tdnode7:172.27.0.13"
-
"
tdnode8:172.27.0.14"
-
"
tdnode9:172.27.0.15"
-
"
tdnode
9
:172.27.0.16"
-
"
tdnode
10
:172.27.0.16"
volumes
:
# bind data directory
-
type
:
bind
...
...
@@ -66,7 +66,9 @@ services:
context
:
.
args
:
-
PACKAGE=${PACKAGE}
-
TARBITRATORPKG=${TARBITRATORPKG}
-
EXTRACTDIR=${DIR}
-
EXTRACTDIR2=${DIR2}
-
DATADIR=${DATADIR}
image
:
'
tdengine:${VERSION}'
container_name
:
'
tdnode2'
...
...
tests/pytest/cluster/clusterEnvSetup/node3.yml
浏览文件 @
3e246468
...
...
@@ -6,7 +6,9 @@ services:
context
:
.
args
:
-
PACKAGE=${PACKAGE}
-
TARBITRATORPKG=${TARBITRATORPKG}
-
EXTRACTDIR=${DIR}
-
EXTRACTDIR2=${DIR2}
-
DATADIR=${DATADIR}
image
:
'
tdengine:${VERSION}'
container_name
:
'
tdnode3'
...
...
@@ -32,7 +34,7 @@ services:
-
"
tdnode7:172.27.0.13"
-
"
tdnode8:172.27.0.14"
-
"
tdnode9:172.27.0.15"
-
"
tdnode
9
:172.27.0.16"
-
"
tdnode
10
:172.27.0.16"
volumes
:
# bind data directory
-
type
:
bind
...
...
tests/pytest/cluster/clusterEnvSetup/node4.yml
浏览文件 @
3e246468
...
...
@@ -6,7 +6,9 @@ services:
context
:
.
args
:
-
PACKAGE=${PACKAGE}
-
TARBITRATORPKG=${TARBITRATORPKG}
-
EXTRACTDIR=${DIR}
-
EXTRACTDIR2=${DIR2}
-
DATADIR=${DATADIR}
image
:
'
tdengine:${VERSION}'
container_name
:
'
tdnode4'
...
...
@@ -32,7 +34,7 @@ services:
-
"
tdnode7:172.27.0.13"
-
"
tdnode8:172.27.0.14"
-
"
tdnode9:172.27.0.15"
-
"
tdnode
9
:172.27.0.16"
-
"
tdnode
10
:172.27.0.16"
volumes
:
# bind data directory
-
type
:
bind
...
...
tests/pytest/cluster/clusterEnvSetup/node5.yml
浏览文件 @
3e246468
...
...
@@ -6,7 +6,9 @@ services:
context
:
.
args
:
-
PACKAGE=${PACKAGE}
-
TARBITRATORPKG=${TARBITRATORPKG}
-
EXTRACTDIR=${DIR}
-
EXTRACTDIR2=${DIR2}
-
DATADIR=${DATADIR}
image
:
'
tdengine:${VERSION}'
container_name
:
'
tdnode5'
...
...
@@ -32,7 +34,7 @@ services:
-
"
tdnode7:172.27.0.13"
-
"
tdnode8:172.27.0.14"
-
"
tdnode9:172.27.0.15"
-
"
tdnode
9
:172.27.0.16"
-
"
tdnode
10
:172.27.0.16"
volumes
:
# bind data directory
-
type
:
bind
...
...
tests/test-all.sh
浏览文件 @
3e246468
...
...
@@ -79,24 +79,26 @@ function runSimCaseOneByOnefq {
date
+%F
\
%T
|
tee
-a
out.log
if
[[
"
$tests_dir
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
echo
-n
$case
./test.sh
-f
$case
>
/dev/null
2>&1
&&
\
./test.sh
-f
$case
>
../../../sim/case.log
2>&1
&&
\
(
grep
-q
'script.*'
$case
'.*failed.*, err.*lineNum'
../../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
||
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)
||
\
(
grep
-q
'script.*success.*m$'
../../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
(
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
&&
echo
'=====================log====================='
&&
cat
../../../sim/case.log
)
else
echo
-n
$case
./test.sh
-f
$case
>
/dev/null
2>&1
&&
\
./test.sh
-f
$case
>
../../sim/case.log
2>&1
&&
\
(
grep
-q
'script.*'
$case
'.*failed.*, err.*lineNum'
../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
||
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)||
\
(
grep
-q
'script.*success.*m$'
../../sim/tsim/log/taoslog0.0
&&
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
out.log
)
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
(
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
out.log
&&
echo
'=====================log====================='
&&
cat
../../sim/case.log
)
fi
out_log
=
`
tail
-1
out.log
`
if
[[
$out_log
=
~
'failed'
]]
;
then
if
[[
"
$tests_dir
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
cp
-r
../../../sim ~/sim_
`
date
"+%Y_%m_%d_%H:%M:%S"
`
rm
-rf
../../../sim/case.log
else
cp
-r
../../sim ~/sim_
`
date
"+%Y_%m_%d_%H:%M:%S"
`
rm
-rf
../../sim/case.log
fi
exit
8
fi
...
...
@@ -105,6 +107,8 @@ function runSimCaseOneByOnefq {
dohavecore
$2
fi
done
rm
-rf
../../../sim/case.log
rm
-rf
../../sim/case.log
}
function
runPyCaseOneByOne
{
...
...
@@ -158,13 +162,16 @@ function runPyCaseOneByOnefq() {
start_time
=
`
date
+%s
`
date
+%F
\
%T
|
tee
-a
pytest-out.log
echo
-n
$case
$line
>
/dev/null
2>&1
&&
\
$line
>
../../sim/case.log
2>&1
&&
\
echo
-e
"
${
GREEN
}
success
${
NC
}
"
|
tee
-a
pytest-out.log
||
\
echo
-e
"
${
RED
}
failed
${
NC
}
"
|
tee
-a
pytest-out.log
end_time
=
`
date
+%s
`
out_log
=
`
tail
-1
pytest-out.log
`
if
[[
$out_log
=
~
'failed'
]]
;
then
cp
-r
../../sim ~/sim_
`
date
"+%Y_%m_%d_%H:%M:%S"
`
echo
'=====================log====================='
cat
../../sim/case.log
rm
-rf
../../sim/case.log
exit
8
fi
echo
execution
time
of
$case
was
`
expr
$end_time
-
$start_time
`
s.
|
tee
-a
pytest-out.log
...
...
@@ -174,6 +181,7 @@ function runPyCaseOneByOnefq() {
dohavecore
$2
fi
done
rm
-rf
../../sim/case.log
}
totalFailed
=
0
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录