From 7786e5560d540c188de0d58becfe95d8c2de9a37 Mon Sep 17 00:00:00 2001 From: Alex Duan <51781608+DuanKuanJun@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:59:27 +0800 Subject: [PATCH 1/4] Update fullopt.py modify -k --- tests/army/community/cmdline/fullopt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py index 39d1d581ed..a9a0b5fd56 100644 --- a/tests/army/community/cmdline/fullopt.py +++ b/tests/army/community/cmdline/fullopt.py @@ -91,7 +91,7 @@ class TDTestCase(TBase): # -C etool.exeBinFile("taosd", "-C") # -k - rets = etool.runBinFile("taosd", "-C") + rets = etool.runBinFile("taosd", "-k") self.checkListNotEmpty(rets) # -V rets = etool.runBinFile("taosd", "-V") From 570189e9a4c669037d62af1b4f4c2f7da6528e0f Mon Sep 17 00:00:00 2001 From: Alex Duan <51781608+DuanKuanJun@users.noreply.github.com> Date: Fri, 26 Jan 2024 18:06:10 +0800 Subject: [PATCH 2/4] Update fullopt.py no check result --- tests/army/community/cmdline/fullopt.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py index a9a0b5fd56..6206aaf6fb 100644 --- a/tests/army/community/cmdline/fullopt.py +++ b/tests/army/community/cmdline/fullopt.py @@ -91,8 +91,7 @@ class TDTestCase(TBase): # -C etool.exeBinFile("taosd", "-C") # -k - rets = etool.runBinFile("taosd", "-k") - self.checkListNotEmpty(rets) + etool.runBinFile("taosd", "-k", wait=False) # -V rets = etool.runBinFile("taosd", "-V") self.checkListNotEmpty(rets) From 9536a1ccf916831ae6efafca771ffbaa11923308 Mon Sep 17 00:00:00 2001 From: Alex Duan <51781608+DuanKuanJun@users.noreply.github.com> Date: Sat, 27 Jan 2024 09:43:45 +0800 Subject: [PATCH 3/4] modify runBinFile to exeBinFile --- tests/army/community/cmdline/fullopt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py index 6206aaf6fb..d1d4421018 100644 --- a/tests/army/community/cmdline/fullopt.py +++ b/tests/army/community/cmdline/fullopt.py @@ -91,7 +91,7 @@ class TDTestCase(TBase): # -C etool.exeBinFile("taosd", "-C") # -k - etool.runBinFile("taosd", "-k", wait=False) + etool.exeBinFile("taosd", "-k", False) # -V rets = etool.runBinFile("taosd", "-V") self.checkListNotEmpty(rets) From f62f84335d1c51980b9f9f3cc2b6bb75e91aac7d Mon Sep 17 00:00:00 2001 From: Alex Duan <51781608+DuanKuanJun@users.noreply.github.com> Date: Sat, 27 Jan 2024 09:51:37 +0800 Subject: [PATCH 4/4] Update coverage_test.sh move coverage.info to before --- tests/script/coverage_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/script/coverage_test.sh b/tests/script/coverage_test.sh index c5e0c31f83..d8f1999b26 100644 --- a/tests/script/coverage_test.sh +++ b/tests/script/coverage_test.sh @@ -219,7 +219,7 @@ function lcovFunc { # generate result echo "generate result" - lcov -l --branch-coverage --function-coverage coverage.info | tee -a $TDENGINE_COVERAGE_REPORT + lcov -l coverage.info --branch-coverage --function-coverage | tee -a $TDENGINE_COVERAGE_REPORT sed -i 's/\/root\/TDengine\/sql.c/\/root\/TDengine\/source\/libs\/parser\/inc\/sql.c/g' coverage.info sed -i 's/\/root\/TDengine\/sql.y/\/root\/TDengine\/source\/libs\/parser\/inc\/sql.y/g' coverage.info @@ -289,4 +289,4 @@ lcovFunc stopTaosd date >> $WORK_DIR/cron.log -echo "End of Coverage Test" | tee -a $WORK_DIR/cron.log \ No newline at end of file +echo "End of Coverage Test" | tee -a $WORK_DIR/cron.log