From e9c5859e41703801e35b4dfcfaf8b6ddf9c05353 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Wed, 2 Dec 2020 15:48:09 +0800
Subject: [PATCH] auto pull submodule code and add more check.

---
 tests/pytest/hivemq-extension-test.py | 69 ++++++++++++++++++++++-----
 1 file changed, 57 insertions(+), 12 deletions(-)

diff --git a/tests/pytest/hivemq-extension-test.py b/tests/pytest/hivemq-extension-test.py
index eb27f7a7d9..3d0b1ef83f 100644
--- a/tests/pytest/hivemq-extension-test.py
+++ b/tests/pytest/hivemq-extension-test.py
@@ -21,6 +21,7 @@ import subprocess
 from shutil import which
 from multipledispatch import dispatch
 
+
 @dispatch(str, str)
 def v_print(msg: str, arg: str):
     if verbose:
@@ -50,28 +51,34 @@ def v_print(msg: str, arg1: int, arg2: int, arg3: int, arg4: int):
     if verbose:
         print(msg % (int(arg1), int(arg2), int(arg3), int(arg4)))
 
+
 def isHiveMQInstalled():
     v_print("%s", "Check if HiveMQ installed")
     defaultHiveMQPath = "/opt/hivemq*"
     hiveMQDir = glob.glob(defaultHiveMQPath)
     if (len(hiveMQDir) == 0):
-        v_print("%s", "ERROR: hivemq not found!")
+        v_print("%s", "ERROR: HiveMQ NOT found")
         return False
     else:
         v_print("HiveMQ installed at %s", hiveMQDir[0])
     return True
 
+
 def isMosquittoInstalled():
     v_print("%s", "Check if mosquitto installed")
     if not which('mosquitto_pub'):
-        v_print("%s", "mosquitto is not installed")
+        v_print("%s", "ERROR: mosquitto is NOT installed")
         return False
     else:
         return True
 
+
 def installExtension():
     currentDir = os.getcwd()
-    os.chdir('../../src/connector/hivemq-tdengine-extension')
+    extDir = 'src/connector/hivemq-tdengine-extension'
+    os.chdir('../..')
+    os.system('git submodule update --init -- %s' % extDir)
+    os.chdir(extDir)
     v_print("%s", "build extension..")
     os.system('mvn clean package')
 
@@ -92,6 +99,7 @@ def installExtension():
 
     os.chdir(currentDir)
 
+
 def stopProgram(prog: str):
     psCmd = "ps ax|grep -w %s| grep -v grep | awk '{print $1}'" % prog
 
@@ -106,9 +114,24 @@ def stopProgram(prog: str):
             psCmd, shell=True).decode("utf-8")
     pass
 
+
 def stopHiveMQ():
     stopProgram("hivemq.jar")
-    v_print("%s", "hivemq is NOT running")
+    v_print("%s", "ERROR: HiveMQ is NOT running")
+
+
+def checkProgramRunning(prog: str):
+    psCmd = "ps ax|grep -w %s| grep -v grep | awk '{print $1}'" % prog
+
+    processID = subprocess.check_output(
+        psCmd, shell=True).decode("utf-8")
+
+    if not processID:
+        v_print("ERROR: %s is NOT running", prog)
+        return False
+    else:
+        return True
+
 
 def runHiveMQ():
     defaultHiveMQPath = "/opt/hivemq*"
@@ -116,11 +139,19 @@ def runHiveMQ():
     runPath = hiveMQDir[0] + '/bin/run.sh > /dev/null &'
     os.system(runPath)
     time.sleep(10)
-    v_print("%s", "hivemq is running")
+
+    if not checkProgramRunning("hivemq.jar"):
+        return False
+    else:
+        v_print("%s", "hivemq is running")
+        return True
+
 
 def getBuildPath():
     selfPath = os.path.dirname(os.path.realpath(__file__))
 
+    binPath = ''
+
     if ("community" in selfPath):
         projPath = selfPath[:selfPath.find("community")]
     else:
@@ -130,9 +161,10 @@ def getBuildPath():
         if ("taosd" in files):
             rootRealPath = os.path.dirname(os.path.realpath(root))
             if ("packaging" not in rootRealPath):
-                buildPath = root[:len(root)-len("/build/bin")]
+                binPath = root[:len(root) - len("/build/bin")]
                 break
-    return buildPath
+    return binPath
+
 
 def runTDengine():
     stopProgram("taosd")
@@ -140,8 +172,8 @@ def runTDengine():
     buildPath = getBuildPath()
 
     if (buildPath == ""):
-        v_print("%s", "taosd NOT found!")
-        os.exit(1)
+        v_print("%s", "ERROR: taosd NOT found!")
+        sys.exit(1)
     else:
         v_print("%s", "taosd found in %s" % buildPath)
 
@@ -149,6 +181,13 @@ def runTDengine():
 
     os.system('%s > /dev/null &' % binPath)
     time.sleep(10)
+    if not checkProgramRunning("taosd"):
+        return False
+    else:
+        v_print("%s", "TDengine is running")
+        return True
+
+
 
 def reCreateDatabase():
     buildPath = getBuildPath()
@@ -157,16 +196,20 @@ def reCreateDatabase():
     os.system('%s -s "DROP DATABASE IF EXISTS hivemq"' % binPath)
     os.system('%s -s "CREATE DATABASE IF NOT EXISTS hivemq"' % binPath)
 
+
 def sendMqttMsg(topic: str, payload: str):
     testStr = 'mosquitto_pub -t %s -m "%s"' % (topic, payload)
     os.system(testStr)
     time.sleep(3)
 
+
 def checkTDengineData(topic: str, payload: str):
     buildPath = getBuildPath()
     binPath = buildPath + "/build/bin/taos"
 
-    output = subprocess.check_output('%s -s "select * from hivemq.mqtt_payload"' % binPath, shell=True).decode('utf-8')
+    output = subprocess.check_output(
+        '%s -s "select * from hivemq.mqtt_payload"' %
+        binPath, shell=True).decode('utf-8')
     if (topic in output) and (payload in output):
         v_print("%s", output)
         return True
@@ -190,11 +233,13 @@ if __name__ == "__main__":
 
     installExtension()
 
-    runTDengine()
+    if not runTDengine():
+        sys.exit(1)
 
     reCreateDatabase()
 
-    runHiveMQ()
+    if not runHiveMQ():
+        sys.exit(1)
 
     sendMqttMsg(testTopic, testPayload)
 
-- 
GitLab