From b4b092b48831df8d0492ae32ea9d769b165634fb Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Fri, 15 May 2020 19:06:41 +0800
Subject: [PATCH] add random test.

---
 .travis.yml                                   |  4 ++--
 tests/pytest/dbmgmt/database-name-boundary.py |  2 +-
 tests/pytest/table/column_num.py              |  2 +-
 tests/pytest/tag_lite/create-tags-boundary.py |  2 +-
 tests/pytest/util/dnodes.py                   | 10 ++--------
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b7ec6ffe7..da0c47ea56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ matrix:
 
           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}'` 
+          for memError in `grep 'ERROR SUMMARY' uniq-mem-error-out.txt | awk '{print $4}'` 
           do
             if [ -n "$memError" ]; then
               if [ "$memError" -gt 12 ]; then
@@ -74,7 +74,7 @@ matrix:
           done
 
           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}'`
+          for defiMemError in `grep 'definitely lost:' uniq-definitely-lost-out.txt | awk '{print $7}'`
           do
             if [ -n "$defiMemError" ]; then
               if [ "$defiMemError" -gt 13 ]; then
diff --git a/tests/pytest/dbmgmt/database-name-boundary.py b/tests/pytest/dbmgmt/database-name-boundary.py
index b57740ebaa..ff6dce22ae 100644
--- a/tests/pytest/dbmgmt/database-name-boundary.py
+++ b/tests/pytest/dbmgmt/database-name-boundary.py
@@ -33,7 +33,7 @@ class TDTestCase:
 
         getDbNameLen = "grep -w '#define TSDB_DB_NAME_LEN' ../../src/inc/taosdef.h|awk '{print $3}'"
         dbNameMaxLen = int(subprocess.check_output(getDbNameLen, shell=True))
-        tdLog.notice("DB name max length is %d" % dbNameMaxLen)
+        tdLog.info("DB name max length is %d" % dbNameMaxLen)
 
         tdLog.info("=============== step1")
         db_name = ''.join(random.choices(chars, k=(dbNameMaxLen + 1)))
diff --git a/tests/pytest/table/column_num.py b/tests/pytest/table/column_num.py
index 6e9b6ca353..486541bab7 100644
--- a/tests/pytest/table/column_num.py
+++ b/tests/pytest/table/column_num.py
@@ -53,7 +53,7 @@ class TDTestCase:
 
         getMaxColumnNum = "grep -w '#define TSDB_MAX_COLUMNS' ../../src/inc/taosdef.h|awk '{print $3}'"
         boundary = int(subprocess.check_output(getMaxColumnNum, shell=True))
-        tdLog.notice("get max column number is %d" % boundary)
+        tdLog.info("get max column number is %d" % boundary)
 
         columnSeq = "ts timestamp"
         for x in range(0, boundary):
diff --git a/tests/pytest/tag_lite/create-tags-boundary.py b/tests/pytest/tag_lite/create-tags-boundary.py
index 12058b2b21..e80f458f0c 100644
--- a/tests/pytest/tag_lite/create-tags-boundary.py
+++ b/tests/pytest/tag_lite/create-tags-boundary.py
@@ -28,7 +28,7 @@ class TDTestCase:
 
         getMaxTagNum = "grep -w TSDB_MAX_TAGS ../../src/inc/taosdef.h|awk '{print $3}'"
         boundary = int(subprocess.check_output(getMaxTagNum, shell=True))
-        tdLog.notice("get max tags number is %d" % boundary)
+        tdLog.info("get max tags number is %d" % boundary)
         for x in range(0, boundary):
             stb_name = "stb%d" % x
 
diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
index 0789c3bc3f..9f7466a7e7 100644
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -244,11 +244,8 @@ class TDDnode:
                 time.sleep(1)
                 processID = subprocess.check_output(psCmd, shell=True)
 
+            self.running = 0
             tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
-            tdLog.debug(
-                "wait 2 seconds for the dnode:%d to stop." %
-                (self.index))
-            time.sleep(2)
 
     def forcestop(self):
         if self.valgrind == 0:
@@ -267,11 +264,8 @@ class TDDnode:
                 time.sleep(1)
                 processID = subprocess.check_output(psCmd, shell=True)
 
+            self.running = 0
             tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
-            tdLog.debug(
-                "wait 2 seconds for the dnode:%d to stop." %
-                (self.index))
-            time.sleep(2)
 
     def startIP(self):
         cmd = "sudo ifconfig lo:%d 192.168.0.%d up" % (self.index, self.index)
-- 
GitLab