add exe build support; add new locker & singleton

haf/main.py

@@ -178,3 +178,7 @@ def main_args():
         print("using python -m haf help to show help infos")
 
 
+if __name__ == "__main__":
+    import multiprocessing
+    multiprocessing.freeze_support()
+    main_args()

haf/mark.py

@@ -1,6 +1,7 @@
 # encoding='utf-8'
 import functools
 import inspect
+import contextlib
 import time
 from haf.common.lock import Lock
 
@@ -90,4 +91,15 @@ def lock(self, *args, **kwargs):
         func(self, *args, **kwargs)
         locker.release_lock()
         return
-    return lock
+    return lock
+
+
+@contextlib.contextmanager
+def new_locker(bus_client, key):
+    locker = Locker(bus_client, key)
+    locker.get_lock()
+    try:
+        yield
+    finally:
+        locker.release_lock()
+        return

haf/runner.py

@@ -13,7 +13,7 @@
 from haf.common.exception import FailRunnerException
 from haf.common.log import Log
 from haf.config import *
-from haf.mark import locker
+from haf.mark import locker, new_locker
 from haf.result import HttpApiResult, AppResult, WebResult
 from haf.suite import HttpApiSuite, AppSuite
 from haf.utils import Utils
@@ -64,10 +64,12 @@ def put_web_message(self, key:str):
                 self.web_queue.get()
             self.web_queue.put(self.runner)
 
-    @locker
+    # TODO: try new_locker here, still need some tests
+    # @locker 
     def put_case_back(self, key:str, case):
         logger.info(f"{self.runner_key} : runner put case {case.ids.id}.{case.ids.subid}-{case.ids.name}")
-        self.case_handler_queue.put(case)
+        with new_locker(self.bus_client, key):
+            self.case_handler_queue.put(case)
 
     def result_handler(self, result):
         if isinstance(result, HttpApiResult) or isinstance(result, AppResult):

publish/build.bat

@@ -0,0 +1,3 @@
+xcopy /e /a /y ..\haf\* .\
+pyinstaller -F main.py -i ..\docs\png\haf.ico --additional-hooks-dir=
+

publish/hook-ctypes.macholib.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from PyInstaller.utils.hooks import copy_metadata
+
+datas = copy_metadata('jsonschema')