diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 052bc62f599a7bf2a89f74628517562571b13bf8..9bc3d3d1371aba8f37296f67d5f5ba53e7b12d0a 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -109,7 +109,7 @@ ./test.sh -f tsim/parser/fill.sim ./test.sh -f tsim/parser/first_last.sim ./test.sh -f tsim/parser/fourArithmetic-basic.sim -# TD-17659 TD-17658 ./test.sh -f tsim/parser/function.sim +# TD-17659 ./test.sh -f tsim/parser/function.sim ./test.sh -f tsim/parser/groupby-basic.sim # ./test.sh -f tsim/parser/groupby.sim # TD-17622 ./test.sh -f tsim/parser/having_child.sim @@ -117,7 +117,7 @@ ./test.sh -f tsim/parser/import_commit1.sim ./test.sh -f tsim/parser/import_commit2.sim ./test.sh -f tsim/parser/import_commit3.sim -# TD-17663 ./test.sh -f tsim/parser/import_file.sim +./test.sh -f tsim/parser/import_file.sim ./test.sh -f tsim/parser/import.sim ./test.sh -f tsim/parser/insert_multiTbl.sim ./test.sh -f tsim/parser/insert_tb.sim diff --git a/tests/script/tsim/dnode/offline_reason.sim b/tests/script/tsim/dnode/offline_reason.sim index 3c6fff8b595b67dc7bc2db45a16d1de57c2879d8..3608dd4a3ab04a3a9cad11f4294fca55f97bffc0 100644 --- a/tests/script/tsim/dnode/offline_reason.sim +++ b/tests/script/tsim/dnode/offline_reason.sim @@ -40,7 +40,7 @@ if $data(2)[4] != ready then endi print ========== step3 -system sh/exec.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop $x = 0 step3: @@ -64,9 +64,10 @@ if $rows != 1 then endi print ========== step5 -system sh/exec.sh -n dnode2 -s start sql create dnode $hostname port 7200 +system sh/exec.sh -n dnode2 -s start +return $x = 0 step5: $x = $x + 1 diff --git a/tests/script/tsim/parser/function.sim b/tests/script/tsim/parser/function.sim index 7dd66bedb0837b18c4023651e7bf948e367ae71e..792771598878f77b9c51fb6b623b20ad5cfcd562 100644 --- a/tests/script/tsim/parser/function.sim +++ b/tests/script/tsim/parser/function.sim @@ -278,7 +278,6 @@ sql create stable td6086st(ts timestamp, d double) tags(t nchar(50)); sql create table td6086ct1 using td6086st tags("ct1"); sql create table td6086ct2 using td6086st tags("ct2"); -return sql SELECT LAST(d),t FROM td6086st WHERE tbname in ('td6086ct1', 'td6086ct2') and ts>="2019-07-30 00:00:00" and ts<="2021-08-31 00:00:00" partition BY tbname interval(1800s) fill(prev); print ==================> td-2624 diff --git a/tests/script/tsim/parser/gendata.sh b/tests/script/tsim/parser/gendata.sh index b2074147ca0a0a4483d19192b45d875ad24a1541..eb3676729eb97dec9981c797ff7d91603ba18348 100755 --- a/tests/script/tsim/parser/gendata.sh +++ b/tests/script/tsim/parser/gendata.sh @@ -3,6 +3,6 @@ Cur_Dir=$(pwd) echo $Cur_Dir -echo "'2020-1-1 1:1:1','abc','device',123,'9876', 'abc', 'net', 'mno', 'province', 'city', 'al'" >> ~/data.sql -echo "'2020-1-2 1:1:1','abc','device',123,'9876', 'abc', 'net', 'mno', 'province', 'city', 'al'" >> ~/data.sql -echo "'2020-1-3 1:1:1','abc','device',123,'9876', 'abc', 'net', 'mno', 'province', 'city', 'al'" >> ~/data.sql +echo "'2020-1-1 1:1:1','abc','device',123,'9876', 'abc', 'net', 'mno', 'province', 'city', 'al'" >> /tmp/data.sql +echo "'2020-1-2 1:1:1','abc','device',123,'9876', 'abc', 'net', 'mno', 'province', 'city', 'al'" >> /tmp/data.sql +echo "'2020-1-3 1:1:1','abc','device',123,'9876', 'abc', 'net', 'mno', 'province', 'city', 'al'" >> /tmp/data.sql diff --git a/tests/script/tsim/parser/import_file.sim b/tests/script/tsim/parser/import_file.sim index 5c778a587584b81e77bf32e37bd8348b68a83bbe..0250af16b3a8883c0cd2bdb0fe303982aeefcfde 100644 --- a/tests/script/tsim/parser/import_file.sim +++ b/tests/script/tsim/parser/import_file.sim @@ -7,7 +7,7 @@ sql drop database if exists indb sql create database if not exists indb sql use indb -$inFileName = '~/data.csv' +$inFileName = '/tmp/data.csv' $numOfRows = 10000 system tsim/parser/gendata.sh @@ -16,8 +16,8 @@ sql create table stbx (ts TIMESTAMP, collect_area NCHAR(12), device_id BINARY(16 sql create table tbx (ts TIMESTAMP, collect_area NCHAR(12), device_id BINARY(16), imsi BINARY(16), imei BINARY(16), mdn BINARY(10), net_type BINARY(4), mno NCHAR(4), province NCHAR(10), city NCHAR(16), alarm BINARY(2)) print ====== create tables success, starting insert data -sql insert into tbx file '~/data.sql' -sql import into tbx file '~/data.sql' +sql insert into tbx file '/tmp/data.sql' +sql import into tbx file '/tmp/data.sql' sql select count(*) from tbx if $rows != 1 then @@ -31,8 +31,8 @@ endi sql drop table tbx; -sql insert into tbx using stbx tags(1,'abc') file '~/data.sql'; -sql insert into tbx using stbx tags(1,'abc') file '~/data.sql'; +sql insert into tbx using stbx tags(1,'abc') file '/tmp/data.sql'; +sql insert into tbx using stbx tags(1,'abc') file '/tmp/data.sql'; sql select count(*) from tbx if $rows != 1 then @@ -44,7 +44,7 @@ if $data00 != 3 then endi sql drop table tbx; -sql insert into tbx using stbx(b) tags('abcf') file '~/data.sql'; +sql insert into tbx using stbx(b) tags('abcf') file '/tmp/data.sql'; sql select ts,a,b from tbx; if $rows != 3 then @@ -64,6 +64,6 @@ if $data02 != @abcf@ then return -1 endi -system rm -f ~/data.sql +system rm -f /tmp/data.sql system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file