Finished refactoring crash_gen tool into a Python modular structure

tests/pytest/crash_gen.sh

@@ -54,6 +54,7 @@ export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3:$(pwd)
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
 
 # Now we are all let, and let's see if we can find a crash. Note we pass all params
+CRASH_GEN_EXEC=crash_gen_bootstrap.py
 if [[ $1 == '--valgrind' ]]; then
   shift
   export PYTHONMALLOC=malloc
@@ -66,14 +67,14 @@ if [[ $1 == '--valgrind' ]]; then
     --leak-check=yes \
     --suppressions=crash_gen/valgrind_taos.supp \
     $PYTHON_EXEC \
-    ./crash_gen/crash_gen.py $@ > $VALGRIND_OUT 2> $VALGRIND_ERR 
+    $CRASH_GEN_EXEC $@ > $VALGRIND_OUT 2> $VALGRIND_ERR 
 elif [[ $1 == '--helgrind' ]]; then
   shift
   valgrind  \
     --tool=helgrind \
     $PYTHON_EXEC \
-    ./crash_gen/crash_gen.py $@
+    $CRASH_GEN_EXEC $@
 else
-  $PYTHON_EXEC ./crash_gen/crash_gen.py $@
+  $PYTHON_EXEC $CRASH_GEN_EXEC $@
 fi
 

tests/pytest/crash_gen/crash_gen.py

@@ -3160,9 +3160,10 @@ class MainExec:
         self._svcMgr = None 
         gSvcMgr = None        
 
+    def init(self): # TODO: refactor
+        global gContainer
+        gContainer = Container() # micky-mouse DI
 
-
-def main():
         # Super cool Python argument library:
         # https://docs.python.org/3/library/argparse.html
         parser = argparse.ArgumentParser(
@@ -3271,12 +3272,12 @@ def main():
 
         Dice.seed(0)  # initial seeding of dice
 
-    # Run server or client
-    mExec = MainExec()
+    def run(self):
         if gConfig.run_tdengine:  # run server
-        mExec.runService()
+            self.runService()
         else:
-        return mExec.runClient()
+            return self.runClient()
+
 
 class Container():
     _propertyList = {'defTdeInstance'}
@@ -3300,9 +3301,3 @@ class Container():
         self._verifyValidProperty(name)
         self._cargo[name] = value
 
-if __name__ == "__main__":
-    gContainer = Container() # micky-mouse DI
-
-    exitCode = main()
-    # print("Exiting with code: {}".format(exitCode))
-    sys.exit(exitCode)

tests/pytest/crash_gen_bootstrap.py

@@ -0,0 +1,23 @@
+# -----!/usr/bin/python3.7
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+import sys
+from crash_gen.crash_gen import MainExec
+
+if __name__ == "__main__":
+    
+    mExec = MainExec()
+    mExec.init()
+    exitCode = mExec.run()
+
+    print("Exiting with code: {}".format(exitCode))
+    sys.exit(exitCode)