diff --git a/Jenkinsfile b/Jenkinsfile index 08b6121f12916a8be712dbc4585f167d4dc679f0..ea50d6ef5a13fed2114868f8a36cd0acace78dd5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { stage('Parallel test stage') { parallel { stage('pytest') { - agent{label 'master'} + agent{label '184'} steps { sh ''' date @@ -34,7 +34,7 @@ pipeline { } } stage('test_b1') { - agent{label '184'} + agent{label 'master'} steps { sh ''' cd ${WKC} diff --git a/tests/pytest/insert/insertIntoTwoTables.py b/tests/pytest/insert/insertIntoTwoTables.py index dc985fbe12efb5cfb7e511336e573a18abcaa358..8b4f423c3dae38a0d8218f7b113f2784259300b4 100644 --- a/tests/pytest/insert/insertIntoTwoTables.py +++ b/tests/pytest/insert/insertIntoTwoTables.py @@ -39,7 +39,7 @@ class TDTestCase: tdSql.query("select * from t0") tdSql.checkRows(1) - tdSql.checkData(0, 0, 1) + tdSql.checkData(0, 1, 1) tdSql.query("select * from t1") tdSql.checkRows(5) diff --git a/tests/pytest/tag_lite/datatype.py b/tests/pytest/tag_lite/datatype.py index f7fa9fa3a2dddaa3f352d02f74872ba42bd32f44..40f0ed7a090683faf149e56620ff63db7a52acb3 100644 --- a/tests/pytest/tag_lite/datatype.py +++ b/tests/pytest/tag_lite/datatype.py @@ -103,7 +103,7 @@ class TDTestCase: tdSql.execute('alter table stb add tag tnc nchar(10)') for tid in range(1, self.ntables + 1): tdSql.execute('alter table tb%d set tag tnc=\"%s\"' % - (tid, str(tid * 1.2))) + (tid, str(tid + 1000000000))) tdLog.info("insert %d data in to each %d tables" % (2, self.ntables)) for rid in range(self.rowsPerTable + 1, self.rowsPerTable + 3): sqlcmd = ['insert into'] diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim index 80c16ff8e4c0de45bbc6e43991a96b75b6c924d3..9b68e5a6a6c7e77fc0e591e4950500369a88a650 100644 --- a/tests/script/general/insert/insert_drop.sim +++ b/tests/script/general/insert/insert_drop.sim @@ -52,10 +52,10 @@ sleep 1000 sql use $db sql drop table tb5 - +$i = 0 while $i < 4 - $tbId = $i + $halfNum - $tb = $tbPrefix . $i + + $tb = tb . $i $x = 0 while $x < $rowNum $xs = $x * $delta