Merge pull request #1927 from taosdata/hotfix/reduce-ci-output

Hotfix/reduce ci output

.travis.yml

@@ -49,7 +49,7 @@ matrix:
           ./test-all.sh $TRAVIS_EVENT_TYPE || travis_terminate $?
 
           cd ${TRAVIS_BUILD_DIR}/tests/pytest
-          ./valgrind-test.sh -g 2>&1 | tee mem-error-out.txt
+          ./valgrind-test.sh -g 2>&1 > mem-error-out.txt
           sleep 1
 
           # Color setting
@@ -59,7 +59,7 @@ matrix:
           GREEN_UNDERLINE='\033[4;32m'
           NC='\033[0m'
 
-          grep 'ERROR SUMMARY' mem-error-out.txt|grep -v 'grep'|uniq|tee uniq-mem-error-out.txt
+          grep 'start to execute\|ERROR SUMMARY' mem-error-out.txt|grep -v 'grep'|uniq|tee uniq-mem-error-out.txt
 
           for memError in `cat uniq-mem-error-out.txt | awk '{print $4}'` 
           do
@@ -72,7 +72,7 @@ matrix:
             fi
           done
 
-          grep 'definitely lost:' mem-error-out.txt|grep -v 'grep'|uniq|tee uniq-definitely-lost-out.txt
+          grep 'start to execute\|definitely lost:' mem-error-out.txt|grep -v 'grep'|uniq|tee uniq-definitely-lost-out.txt
           for defiMemError in `cat uniq-definitely-lost-out.txt | awk '{print $7}'`
           do
             if [ -n "$defiMemError" ]; then

tests/pytest/insert/float.py

@@ -43,7 +43,7 @@ class TDTestCase:
                 "This test failed: insert wrong data error _not_ catched")
         except Exception as e:
             tdLog.info(repr(e))
-            tdLog.notice("insert wrong data error catched")
+            tdLog.info("insert wrong data error catched")
 
         cmd = 'select * from tb order by ts desc'
         tdLog.info(cmd)
@@ -82,7 +82,7 @@ class TDTestCase:
                        insert wrong data error _not_ catched")
         except Exception as e:
             tdLog.info(repr(e))
-            tdLog.notice("insert wrong data error catched")
+            tdLog.info("insert wrong data error catched")
 
         cmd = "insert into tb values (now+4a, 0)"
         tdLog.info(cmd)
@@ -103,7 +103,7 @@ class TDTestCase:
                 "This test failed: insert wrong data error _not_ catched")
         except Exception as e:
             tdLog.info(repr(e))
-            tdLog.notice("insert wrong data error catched")
+            tdLog.info("insert wrong data error catched")
 
         cmd = "insert into tb values (now+5a, 2)"
         tdLog.info(cmd)
@@ -124,7 +124,7 @@ class TDTestCase:
                 "This test failed: insert wrong data error _not_ catched")
         except Exception as e:
             tdLog.info(repr(e))
-            tdLog.notice("insert wrong data error catched")
+            tdLog.info("insert wrong data error catched")
 
         cmd = "insert into tb values (now+6a, 2)"
         tdLog.info(cmd)

tests/pytest/insert/int.py

@@ -47,7 +47,7 @@ class TDTestCase:
                 "This test failed: INT data overflow error _not_ catched")
         except Exception as e:
             tdLog.info(repr(e))
-            tdLog.notice("INT data overflow error catched")
+            tdLog.info("INT data overflow error catched")
 
         cmd = 'insert into tb values (now+1m, NULL)'
         tdLog.info(cmd)
@@ -76,7 +76,7 @@ class TDTestCase:
                 "This test failed: INT data overflow error _not_ catched")
         except Exception as e:
             tdLog.info(repr(e))
-            tdLog.notice("INT data overflow error catched")
+            tdLog.info("INT data overflow error catched")
 
         cmd = 'insert into tb values (now+3m, NULL)'
         tdLog.info(cmd)
@@ -96,7 +96,7 @@ class TDTestCase:
                 "This test failed: insert wrong data error _not_ catched")
         except Exception as e:
             tdLog.info(repr(e))
-            tdLog.notice("insert wrong data error catched")
+            tdLog.info("insert wrong data error catched")
 
         cmd = 'insert into tb values (now+4m, 0)'
         tdLog.info(cmd)
@@ -116,7 +116,7 @@ class TDTestCase:
                 "This test failed: insert wrong data error _not_ catched")
         except Exception as e:
             tdLog.info(repr(e))
-            tdLog.notice("insert wrong data error catched")
+            tdLog.info("insert wrong data error catched")
 
         cmd = 'insert into tb values (now+5m, 2)'
         tdLog.info(cmd)
@@ -135,7 +135,7 @@ class TDTestCase:
                 "This test failed: insert wrong data error _not_ catched")
         except Exception as e:
             tdLog.info(repr(e))
-            tdLog.notice("insert wrong data error catched")
+            tdLog.info("insert wrong data error catched")
 
         cmd = 'insert into tb values (now+6m, 2)'
         tdLog.info(cmd)

tests/pytest/smoketest.sh

@@ -29,8 +29,6 @@ python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f table/db_table.py
 python3 ./test.py $1 -s && sleep 1
 
-python3 ./test.py $1 -f import_merge/importCacheFileT.py
-python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importDataLastSub.py
 python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importHead.py

tests/pytest/test.py

@@ -79,7 +79,8 @@ if __name__ == "__main__":
             time.sleep(1)
             processID = subprocess.check_output(psCmd, shell=True)
 
-        tdLog.exit('stop All dnodes')
+        tdLog.info('stop All dnodes')
+        sys.exit(0)
 
     tdDnodes.init(deployPath)
     tdDnodes.setTestCluster(testCluster)

tests/pytest/util/cases.py

@@ -57,7 +57,7 @@ class TDCases:
                 runNum += 1
                 continue
 
-        tdLog.notice("total %d Linux test case(s) executed" % (runNum))
+        tdLog.info("total %d Linux test case(s) executed" % (runNum))
 
     def runOneLinux(self, conn, fileName):
         testModule = self.__dynamicLoadModule(fileName)
@@ -76,8 +76,6 @@ class TDCases:
                 runNum += 1
                 continue
 
-        tdLog.success("total %d Linux test case(s) executed" % (runNum))
-
     def runAllWindows(self, conn):
         # TODO: load all Windows cases here
         runNum = 0

tests/pytest/util/dnodes.py

@@ -202,7 +202,7 @@ class TDDnode:
         if (binPath == ""):
             tdLog.exit("taosd not found!s")
         else:
-            tdLog.notice("taosd found in %s" % rootRealPath)
+            tdLog.info("taosd found in %s" % rootRealPath)
 
         if self.deployed == 0:
             tdLog.exit("dnode:%d is not deployed" % (self.index))
@@ -408,7 +408,7 @@ class TDDnodes:
             tdLog.exit("index:%d should on a scale of [1, 10]" % (index))
 
     def stopAll(self):
-        tdLog.debug("stop all dnodes")
+        tdLog.info("stop all dnodes")
         for i in range(len(self.dnodes)):
             self.dnodes[i].stop()
 

tests/pytest/valgrind-test.sh

@@ -29,7 +29,5 @@ python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f table/db_table.py
 python3 ./test.py $1 -s && sleep 1
 
-python3 ./test.py $1 -f import_merge/importCacheFileT.py
-python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importDataLastSub.py
 python3 ./test.py $1 -s && sleep 1