From 6c9b2bf6961bf283772a5c30cd0e2fb3e08ebc58 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Mon, 4 Jan 2021 19:20:19 +0800 Subject: [PATCH 1/5] [TD-2607] add test case --- tests/pytest/functions/function_first.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/pytest/functions/function_first.py b/tests/pytest/functions/function_first.py index 2b78bd33d8..8c08a87ace 100644 --- a/tests/pytest/functions/function_first.py +++ b/tests/pytest/functions/function_first.py @@ -110,6 +110,9 @@ class TDTestCase: tdSql.query("select first(col9) from test1") tdSql.checkRows(1) tdSql.checkData(0, 0, '涛思数据1') + # TD-2607 first,last + where none exist condition + interval + tdSql.query("select first(*),last(*) from test1 where ts < 23 interval(1s)") + tdSql.checkRows(0) def stop(self): tdSql.close() From f355d37c67e9e6e2829340559cb34b68c128bc70 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Mon, 4 Jan 2021 19:21:13 +0800 Subject: [PATCH 2/5] fix --- tests/pytest/functions/function_first.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/pytest/functions/function_first.py b/tests/pytest/functions/function_first.py index 8c08a87ace..5b2aacb779 100644 --- a/tests/pytest/functions/function_first.py +++ b/tests/pytest/functions/function_first.py @@ -110,6 +110,7 @@ class TDTestCase: tdSql.query("select first(col9) from test1") tdSql.checkRows(1) tdSql.checkData(0, 0, '涛思数据1') + # TD-2607 first,last + where none exist condition + interval tdSql.query("select first(*),last(*) from test1 where ts < 23 interval(1s)") tdSql.checkRows(0) From 073c78bb1d83eab1ee2f7d861f60863b28fafe89 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 5 Jan 2021 10:50:09 +0800 Subject: [PATCH 3/5] fix azure error --- tests/pytest/handle_crash_gen_val_log.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/pytest/handle_crash_gen_val_log.sh b/tests/pytest/handle_crash_gen_val_log.sh index 0f89ef2ec4..526fa48340 100755 --- a/tests/pytest/handle_crash_gen_val_log.sh +++ b/tests/pytest/handle_crash_gen_val_log.sh @@ -36,10 +36,14 @@ for defiMemError in `grep 'definitely lost:' crash_gen-definitely-lost-out.log | do defiMemError=(${defiMemError//,/}) if [ -n "$defiMemError" ]; then - if [ "$defiMemError" -gt 3 ]; then + if [ "$defiMemError" -gt 3 -a "$defiMemError" -lt 1013 ]; then echo -e "${RED} ## Memory errors number valgrind reports \ Definitely lost is $defiMemError. More than our threshold! ## ${NC}" - exit 8 + exit 8 + elif [ "$defiMemError" -gt 1013 ];then #add for azure + echo -e "${RED} ## Memory errors number valgrind reports \ + Definitely lost is $defiMemError. More than our threshold! ## ${NC}" + exit 8 fi fi done From b2289dd6940959a73f75bda44503ff33a34dc4bc Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 5 Jan 2021 13:33:42 +0800 Subject: [PATCH 4/5] more steps on crash_gen with valgrind --- tests/pytest/handle_crash_gen_val_log.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pytest/handle_crash_gen_val_log.sh b/tests/pytest/handle_crash_gen_val_log.sh index 526fa48340..528316700d 100755 --- a/tests/pytest/handle_crash_gen_val_log.sh +++ b/tests/pytest/handle_crash_gen_val_log.sh @@ -16,7 +16,7 @@ TOP_DIR=`pwd` TAOSD_DIR=`find . -name "taosd"|grep -v community|head -n1` nohup $TAOSD_DIR >/dev/null & cd - -./crash_gen.sh --valgrind -p -t 10 -s 250 -b 4 +./crash_gen.sh --valgrind -p -t 10 -s 350 -b 4 pidof taosd|xargs kill -9 grep 'start to execute\|ERROR SUMMARY' valgrind.err|grep -v 'grep'|uniq|tee crash_gen_mem_err.log From 77cc0b18b7830866b040f6d985a98901860d10e0 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 5 Jan 2021 14:44:19 +0800 Subject: [PATCH 5/5] [TD-2588]sleep more for azure --- tests/pytest/util/dnodes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py index 83cb4e8d99..afea23372f 100644 --- a/tests/pytest/util/dnodes.py +++ b/tests/pytest/util/dnodes.py @@ -291,8 +291,8 @@ class TDDnode: break tdLog.debug("the dnode:%d has been started." % (self.index)) else: - tdLog.debug("wait 5 seconds for the dnode:%d to start." % (self.index)) - time.sleep(5) + tdLog.debug("wait 10 seconds for the dnode:%d to start." % (self.index)) + time.sleep(10) # time.sleep(5)