From ce6e0741c37a31b61d0a98e597f53d34ca8832f0 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Thu, 30 Apr 2020 10:57:07 +0800 Subject: [PATCH 1/2] reduce CI output to make the log clear. [TD-214] --- .travis.yml | 24 ++++++++++++------------ tests/pytest/smoketest.sh | 11 +++++++++++ tests/pytest/util/log.py | 8 ++++---- tests/test-all.sh | 4 ++-- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7df3a7d7fe..37e6e5a6c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,15 +32,15 @@ matrix: - cd debug script: - - cmake .. - - make + - cmake .. > /dev/null + - make > /dev/null after_success: - |- case $TRAVIS_OS_NAME in linux) cd ${TRAVIS_BUILD_DIR}/debug - make install || travis_terminate $? + make install > /dev/null || travis_terminate $? pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/ pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/ @@ -98,11 +98,11 @@ matrix: # Commands to prepare for build_command # ** likely specific to your build ** - build_command_prepend: cmake . + build_command_prepend: cmake . > /dev/null # The command that will be added as an argument to "cov-build" to compile your project for analysis, # ** likely specific to your build ** - build_command: make + build_command: make > /dev/null # Pattern to match selecting branches that will run analysis. We recommend leaving this set to 'coverity_scan'. # Take care in resource usage, and consider the build frequency allowances per @@ -135,15 +135,15 @@ matrix: - cd debug script: - - cmake -DCOVER=true .. - - make + - cmake -DCOVER=true .. > /dev/null + - make > /dev/null after_success: - |- case $TRAVIS_OS_NAME in linux) cd ${TRAVIS_BUILD_DIR}/debug - make install || travis_terminate $? + make install > /dev/null || travis_terminate $? pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/ pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/ @@ -208,8 +208,8 @@ matrix: - cd debug script: - - cmake .. - - make + - cmake .. > /dev/null + - make > /dev/null # - os: osx # language: c @@ -225,5 +225,5 @@ matrix: # - cd ${TRAVIS_BUILD_DIR} # - mkdir debug # - cd debug - # - cmake .. - # - make + # - cmake .. > /dev/null + # - make > /dev/null diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh index 71d19df5c0..af597fb6c5 100755 --- a/tests/pytest/smoketest.sh +++ b/tests/pytest/smoketest.sh @@ -23,6 +23,17 @@ sleep 1 python3 ./test.py $1 -f insert/tinyint.py python3 ./test.py -s $1 sleep 1 + +python3 ./test.py $1 -f table/column_name.py +python3 ./test.py -s $1 +sleep 1 +python3 ./test.py $1 -f table/column_num.py +python3 ./test.py -s $1 +sleep 1 +python3 ./test.py $1 -f table/db_table.py +python3 ./test.py -s $1 +sleep 1 + python3 ./test.py $1 -f import_merge/importDataLastTO.py python3 ./test.py -s $1 sleep 1 diff --git a/tests/pytest/util/log.py b/tests/pytest/util/log.py index 97c8b2ef7f..bcd840999d 100644 --- a/tests/pytest/util/log.py +++ b/tests/pytest/util/log.py @@ -23,14 +23,14 @@ class TDLog: self.path = "" def info(self, info): - printf("%s %s" % (datetime.datetime.now(), info)) + print("%s %s" % (datetime.datetime.now(), info)) def sleep(self, sec): - printf("%s sleep %d seconds" % (datetime.datetime.now(), sec)) + print("%s sleep %d seconds" % (datetime.datetime.now(), sec)) time.sleep(sec) def debug(self, err): - printf("\033[1;36m%s %s\033[0m" % (datetime.datetime.now(), err)) + print("\033[1;36m%s %s\033[0m" % (datetime.datetime.now(), err)) def success(self, info): printf("\033[1;32m%s %s\033[0m" % (datetime.datetime.now(), info)) @@ -43,7 +43,7 @@ class TDLog: sys.exit(1) def printNoPrefix(self, info): - printf("\033[1;36m%s\033[0m" % (info)) + print("\033[1;36m%s\033[0m" % (info)) tdLog = TDLog() diff --git a/tests/test-all.sh b/tests/test-all.sh index 98ecd71dd8..ee1904ba7c 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -27,9 +27,9 @@ fi cd ../pytest if [ "$1" == "cron" ]; then - ./fulltest.sh 2>&1 | tee pytest-out.txt + ./fulltest.sh > /dev/null | tee pytest-out.txt else - ./smoketest.sh 2>&1 | tee pytest-out.txt + ./smoketest.sh > /dev/null | tee pytest-out.txt fi totalPySuccess=`grep 'successfully executed' pytest-out.txt | wc -l` From 491d3d2de69790dd38a49f5e266f80724e7f690d Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Thu, 30 Apr 2020 11:15:47 +0800 Subject: [PATCH 2/2] add table/* test cases. --- tests/pytest/table/column_name.py | 181 ++++++++++++++++++++++++++++++ tests/pytest/table/column_num.py | 178 +++++++++++++++++++++++++++++ tests/pytest/table/db_table.py | 49 ++++++++ 3 files changed, 408 insertions(+) create mode 100644 tests/pytest/table/column_name.py create mode 100644 tests/pytest/table/column_num.py create mode 100644 tests/pytest/table/db_table.py diff --git a/tests/pytest/table/column_name.py b/tests/pytest/table/column_name.py new file mode 100644 index 0000000000..6c945646d5 --- /dev/null +++ b/tests/pytest/table/column_name.py @@ -0,0 +1,181 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + def run(self): + tdSql.prepare() + + # TSIM: system sh/stop_dnodes.sh + # TSIM: + # TSIM: system sh/ip.sh -i 1 -s up + # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + # TSIM: system sh/cfg.sh -n dnode1 -c commitLog -v 0 + # TSIM: system sh/exec.sh -n dnode1 -s start + # TSIM: + # TSIM: sleep 3000 + # TSIM: sql connect + # TSIM: + # TSIM: $i = 0 + # TSIM: $dbPrefix = lm_cm_db + # TSIM: $tbPrefix = lm_cm_tb + # TSIM: $db = $dbPrefix . $i + # TSIM: $tb = $tbPrefix . $i + # TSIM: + # TSIM: print =============== step1 + tdLog.info('=============== step1') + # TSIM: sql create database $db + # TSIM: sql use $db + # TSIM: + # TSIM: sql drop table dd -x step0 + tdLog.info('drop table dd -x step0') + tdSql.error('drop table dd') + # TSIM: return -1 + # TSIM: step0: + # TSIM: + # TSIM: sql create table $tb(ts timestamp, int) -x step1 + tdLog.info('create table tb(ts timestamp, int) -x step1') + tdSql.error('create table tb(ts timestamp, int)') + # TSIM: return -1 + # TSIM: step1: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step2 + tdLog.info('=============== step2') + # TSIM: sql create table $tb (ts timestamp, s int) + tdLog.info('create table tb (ts timestamp, s int)') + tdSql.execute('create table tb (ts timestamp, s int)') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop table $tb + tdLog.info('drop table tb') + tdSql.execute('drop table tb') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step3 + tdLog.info('=============== step3') + # TSIM: sql create table $tb (ts timestamp, a0123456789 int) + tdLog.info('create table tb (ts timestamp, a0123456789 int)') + tdSql.execute('create table tb (ts timestamp, a0123456789 int)') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop table $tb + tdLog.info('drop table tb') + tdSql.execute('drop table tb') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step4 + tdLog.info('=============== step4') + # TSIM: sql create table $tb (ts timestamp, + # a0123456789012345678901234567890123456789 int) + tdLog.info( + 'create table tb (ts timestamp, a0123456789012345678901234567890123456789 int)') + tdSql.execute( + 'create table tb (ts timestamp, a0123456789012345678901234567890123456789 int)') + # TSIM: sql drop table $tb + tdLog.info('drop table tb') + tdSql.execute('drop table tb') + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step5 + tdLog.info('=============== step5') + # TSIM: sql create table $tb (ts timestamp, a0123456789 int) + tdLog.info('create table tb (ts timestamp, a0123456789 int)') + tdSql.execute('create table tb (ts timestamp, a0123456789 int)') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql insert into $tb values (now , 1) + tdLog.info("insert into tb values (now , 1)") + tdSql.execute("insert into tb values (now , 1)") + # TSIM: sql select * from $tb + tdLog.info('select * from tb') + tdSql.query('select * from tb') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop database $db + tdLog.info('drop database db') + tdSql.execute('drop database db') + # TSIM: sql show databases + tdLog.info('show databases') + tdSql.query('show databases') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: + # TSIM: + # TSIM: +# convert end + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/table/column_num.py b/tests/pytest/table/column_num.py new file mode 100644 index 0000000000..fca5b01ac2 --- /dev/null +++ b/tests/pytest/table/column_num.py @@ -0,0 +1,178 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + def run(self): + tdSql.prepare() + + # TSIM: system sh/stop_dnodes.sh + # TSIM: + # TSIM: system sh/ip.sh -i 1 -s up + # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + # TSIM: system sh/cfg.sh -n dnode1 -c commitLog -v 0 + # TSIM: system sh/exec.sh -n dnode1 -s start + # TSIM: + # TSIM: sleep 3000 + # TSIM: sql connect + # TSIM: + # TSIM: $i = 0 + # TSIM: $dbPrefix = lm_cn_db + # TSIM: $tbPrefix = lm_cn_tb + # TSIM: $db = $dbPrefix . $i + # TSIM: $tb = $tbPrefix . $i + # TSIM: + # TSIM: print =============== step1 + tdLog.info('=============== step1') + # TSIM: sql create database $db + # TSIM: sql use $db + # TSIM: + # TSIM: sql create table $tb() -x step1 + tdLog.info('create table tb() -x step1') + tdSql.error('create table tb()') + # TSIM: return -1 + # TSIM: step1: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step2 + tdLog.info('=============== step2') + # TSIM: sql create table $tb (ts timestamp) -x step2 + tdLog.info('create table tb (ts timestamp) -x step2') + tdSql.error('create table tb (ts timestamp) ') + # TSIM: return -1 + # TSIM: step2: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step3 + tdLog.info('=============== step3') + # TSIM: sql create table $tb (ts int) -x step3 + tdLog.info('create table tb (ts int) -x step3') + tdSql.error('create table tb (ts int) ') + # TSIM: return -1 + # TSIM: step3: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step4 + tdLog.info('=============== step4') + # TSIM: sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 + # int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 + # int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, + # a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 + # int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, + # b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 + # int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, + # b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 + # int, b28 int,b29 int,b30 int,b31 int,b32 int) + tdLog.info('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)') + tdSql.execute('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)') + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step5 + tdLog.info('=============== step5') + # TSIM: $i = 1 + # TSIM: $tb = $tbPrefix . $i + # TSIM: + # TSIM: sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 + # int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 + # int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, + # a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 + # int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, + # b4 int, b5 int) + tdLog.info('create table tb1 (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)') + tdSql.execute('create table tb1 (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)') + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 2 then + tdLog.info('tdSql.checkRow(2)') + tdSql.checkRows(2) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql insert into $tb values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 + # , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 + # , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37) + tdLog.info("insert into tb1 values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)") + tdSql.execute("insert into tb1 values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)") + # TSIM: sql select * from $tb + tdLog.info('select * from tb1') + tdSql.query('select * from tb1') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop table $tb + tdLog.info('drop table tb1') + tdSql.execute('drop table tb1') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop database $db + tdLog.info('drop database db') + tdSql.execute('drop database db') + # TSIM: sql show databases + tdLog.info('show databases') + tdSql.query('show databases') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi +# convert end + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/table/db_table.py b/tests/pytest/table/db_table.py new file mode 100644 index 0000000000..d4a8568375 --- /dev/null +++ b/tests/pytest/table/db_table.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + def run(self): + tdSql.prepare() + + tdLog.info('=============== step1') + tdLog.info('=============== step2') + tdLog.info('create table tb (ts timestamp, speed int)') + tdSql.execute('create table tb (ts timestamp, speed int)') + tdLog.info('=============== step3') + tdLog.info("insert into tb values (now, 1)") + tdSql.execute("insert into tb values (now, 1)") + tdLog.info('=============== step4') + tdLog.info('select * from tb') + tdSql.query('select * from tb') + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + tdLog.info('tdSql.checkData(0, 1, 1)') + tdSql.checkData(0, 1, 1) + tdLog.info('=============== step5') + tdLog.info('describe tb') + tdSql.query('describe tb') + tdLog.info('=============== step6') + tdLog.info('drop database db') + tdSql.execute('drop database db') + tdLog.info('show databases') + tdSql.query('show databases') + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) +# convert end + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase())