From 56dc7b73fcdab5726e1569ef18efec892d64f6fa Mon Sep 17 00:00:00 2001 From: Ping Xiao Date: Thu, 22 Apr 2021 18:55:14 +0800 Subject: [PATCH] enable apitest and add sleep time --- tests/perftest-scripts/perftest-query.sh | 2 +- tests/test-all.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/perftest-scripts/perftest-query.sh b/tests/perftest-scripts/perftest-query.sh index 0325f552b1..9a16084683 100755 --- a/tests/perftest-scripts/perftest-query.sh +++ b/tests/perftest-scripts/perftest-query.sh @@ -64,7 +64,7 @@ function runQueryPerfTest { [ -f $PERFORMANCE_TEST_REPORT ] && rm $PERFORMANCE_TEST_REPORT nohup $WORK_DIR/TDengine/debug/build/bin/taosd -c /etc/taosperf/ > /dev/null 2>&1 & echoInfo "Wait TDengine to start" - sleep 120 + sleep 300 echoInfo "Run Performance Test" cd $WORK_DIR/TDengine/tests/pytest diff --git a/tests/test-all.sh b/tests/test-all.sh index efeecd1044..47e5de6aa0 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -481,14 +481,14 @@ if [ "$2" != "sim" ] && [ "$2" != "python" ] && [ "$2" != "jdbc" ] && [ "$2" != totalExamplePass=0 echo "Running tests" - # ./apitest > /dev/null 2>&1 - # if [ $? != "0" ]; then - # echo "apitest failed" - # totalExampleFailed=`expr $totalExampleFailed + 1` - # else - # echo "apitest pass" - # totalExamplePass=`expr $totalExamplePass + 1` - # fi + ./apitest > /dev/null 2>&1 + if [ $? != "0" ]; then + echo "apitest failed" + totalExampleFailed=`expr $totalExampleFailed + 1` + else + echo "apitest pass" + totalExamplePass=`expr $totalExamplePass + 1` + fi ./prepare 127.0.0.1 > /dev/null 2>&1 if [ $? != "0" ]; then -- GitLab