Kea2-python 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

kea2/fastbotManager.py

@@ -23,13 +23,14 @@ class FastbotManager:
         self.thread = None
 
 
-    def _activateFastbot(self, options: "Options") -> threading.Thread:
+    def _activateFastbot(self) -> threading.Thread:
         """
         activate fastbot.
         :params: options: the running setting for fastbot
         :params: port: the listening port for script driver
         :return: the fastbot daemon thread
         """
+        options = self.options
         cur_dir = Path(__file__).parent
         push_file(
             Path.joinpath(cur_dir, "assets/monkeyq.jar"),
@@ -67,7 +68,7 @@ class FastbotManager:
             device=options.serial
         )
 
-        t = self._startFastbotService(options)
+        t = self._startFastbotService()
         logger.info("Running Fastbot...")
 
         return t
@@ -134,7 +135,7 @@ class FastbotManager:
         return self.return_code
 
     def start(self):
-        self.thread = self._startFastbotService()
+        self.thread = self._activateFastbot()
 
     def join(self):
         if self.thread:

kea2/keaUtils.py

@@ -255,8 +255,8 @@ class KeaTestRunner(TextTestRunner):
         global LOGFILE, RESFILE
         LOGFILE = output_dir / Path(LOGFILE)
         RESFILE = output_dir / Path(RESFILE)
-        logger.debug(f"Log file: {LOGFILE}")
-        logger.debug(f"Result file: {RESFILE}")
+        logger.info(f"Log file: {LOGFILE}")
+        logger.info(f"Result file: {RESFILE}")
 
     def run(self, test):
 
@@ -293,9 +293,10 @@ class KeaTestRunner(TextTestRunner):
                         message=r"Please use assert\w+ instead.",
                     )
 
-            log_watcher = LogWatcher(LOGFILE)
             fb = FastbotManager(self.options, LOGFILE)
             fb.start()
+
+            log_watcher = LogWatcher(LOGFILE)
             
             if self.options.agent == "u2":
                 # initialize the result.json file

kea2/logWatcher.py

@@ -2,6 +2,10 @@ import re
 import os
 import threading
 import time
+from .utils import getLogger
+
+
+logger = getLogger(__name__)
 
 
 PATTERN_EXCEPTION = re.compile(r"\[Fastbot\].+Internal\serror\n([\s\S]*)")
@@ -16,7 +20,7 @@ def thread_excepthook(args):
 
 class LogWatcher:
 
-    def watcher(self, poll_interval=1):
+    def watcher(self, poll_interval=0.5):
         self.buffer = ""
         self.last_pos = 0
 
@@ -28,7 +32,6 @@ class LogWatcher:
         self.read_log()
         
     def read_log(self):
-        time.sleep(0.02)
         with open(self.log_file, 'r', encoding='utf-8') as f:
             f.seek(self.last_pos)
             new_data = f.read()
@@ -60,15 +63,19 @@ class LogWatcher:
                     , flush=True)
 
     def __init__(self, log_file):
+        logger.info(f"Watching log: {log_file}")
         self.log_file = log_file
         self.end_flag = False
 
         threading.excepthook = thread_excepthook
-        t = threading.Thread(target=self.watcher, daemon=True)
-        t.start()
+        self.t = threading.Thread(target=self.watcher, daemon=True)
+        self.t.start()
     
     def close(self):
+        logger.info("Close: LogWatcher")
         self.end_flag = True
+        if self.t:
+            self.t.join()
 
 
 if __name__ == "__main__":

kea2/utils.py

@@ -47,14 +47,10 @@ d = Device
 
 
 def getProjectRoot():
-    root = Path("/")
+    root = Path(Path.cwd().anchor)
     cur_dir = Path.absolute(Path(os.curdir))
     while not os.path.isdir(cur_dir / "configs"):
         if cur_dir == root:
             return None
         cur_dir = cur_dir.parent
     return cur_dir
-
-
-
- 

{kea2_python-0.1.0.dist-info → kea2_python-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 0.1.0
+Version: 0.1.1
 Summary: A python library for supporting and customizing automated UI testing for mobile apps
 Author-email: Xixian Liang <xixian@stu.ecnu.edu.cn>
 Requires-Python: >=3.8

{kea2_python-0.1.0.dist-info → kea2_python-0.1.1.dist-info}/RECORD

@@ -3,16 +3,16 @@ kea2/absDriver.py,sha256=X99d-OP77EIiDwTLvWVkgDUtqscoxmWeOb-EcaOPWGI,1294
 kea2/adbUtils.py,sha256=j6goAAzV1Ikmv26DZEE0Oi8S1PrejcV1Io3u_Xw4ws4,9910
 kea2/bug_report_generator.py,sha256=FFop6asItUvRmg23i85-cDutKwJGL6-WmVSNk-BQ2oQ,22712
 kea2/cli.py,sha256=YgWOe5JB0_WBTKyBShBEymhLIqj6K5gNR4Aaj6Pbtn0,2796
-kea2/fastbotManager.py,sha256=RQYs6kcDir-UmVoGecVYmygLjV4aa5hUCQ8FHp_zE_k,4524
-kea2/keaUtils.py,sha256=eaYFk7r-WEU9cxP6I6qd8JxSLEvsvmo8-aCOuMoKWkU,24534
+kea2/fastbotManager.py,sha256=6U-mWZHqwMXXNbHGNLNjjsolqDaqZUMpRhCBKjepcTQ,4524
+kea2/keaUtils.py,sha256=fXE0vpFik2YN5Ze_wQ-XY8IjaoA3P2C0PFXLfAFvZIU,24533
 kea2/kea_launcher.py,sha256=Kj49TBJ8aRRJQI24y3vwbBMyTenJpL1HAqgv4ETRT9E,4986
-kea2/logWatcher.py,sha256=RQp9b6yF24Vh6_dUgx-nrSjiz-mP4uXjyVz7_HfYQ28,2029
+kea2/logWatcher.py,sha256=qpIsflbP37eX5b4EaWnrqyPbGP9lzQhRr3ainGFfZeI,2211
 kea2/resultSyncer.py,sha256=f3qfne8WQCo1AA3cwx9IZzLdenjjMWbEpAqPdvddAqk,1984
 kea2/u2Driver.py,sha256=1uViwhQAkBFu69XFR5i8dSgG8SL3v7wZ68-t0E0Xlpw,14876
-kea2/utils.py,sha256=bLS8SokdLffOnRrncDn6JBNrnYzAQ-pIOsE4uLirwbA,1374
+kea2/utils.py,sha256=8b4y-_B7knKRN_HqpWZM900IdRiZXwmzQnduVVN0GxQ,1384
 kea2/assets/fastbot-thirdpart.jar,sha256=0SZ_OoZFWDGMnazgXKceHgKvXdUDoIa3Gb2bcifaikk,85664
 kea2/assets/framework.jar,sha256=rTluOJJKj2DFwh7ascXso1udYdWv00BxBwSQ3Vmv-fw,1149240
-kea2/assets/monkeyq.jar,sha256=AGdeTNMoT97R4XzC3rCwXHDUqVm6de-_tjIdlnlpNgQ,463106
+kea2/assets/monkeyq.jar,sha256=gE_0JmE7S3Mw5s0KNDMxc3eVKZP669aOFa7r3c3pzKM,463069
 kea2/assets/quicktest.py,sha256=j-fIryvspXObaNm3kWzgM0LMFes4h7EXT5C9xUWGUVo,2887
 kea2/assets/fastbot_configs/abl.strings,sha256=Rn8_YEbVGOJqndIY_-kWnR5NaoFI-cuB-ij10Ddhl90,75
 kea2/assets/fastbot_configs/awl.strings,sha256=-j4980GoWQxGOM9ijAwXPQmziCwFBZJFmuiv2tOEaYI,101
@@ -27,9 +27,9 @@ kea2/assets/fastbot_libs/armeabi-v7a/libfastbot_native.so,sha256=UV8bhaiPoPKdd3q
 kea2/assets/fastbot_libs/x86/libfastbot_native.so,sha256=k-aw1gEXRWMKZRNHIggKNuZy0wC1y2BnveJGEIO6rbo,2036856
 kea2/assets/fastbot_libs/x86_64/libfastbot_native.so,sha256=tiofhlf4uMQcU5WAvrdLgTBME0lb83hVUoGtTwxmE8A,2121416
 kea2/templates/bug_report_template.html,sha256=sQ0Uu8SPeOIiyX5vPPTZPVKxh9-9raAZcCjSRS8YFe0,40624
-kea2_python-0.1.0.dist-info/licenses/LICENSE,sha256=nM9PPjcsXVo5SzNsjRqWgA-gdJlwqZZcRDSC6Qf6bVE,2034
-kea2_python-0.1.0.dist-info/METADATA,sha256=io8HvvN6aGxT5r-hqf5CmVvfEf1Utdd65UCeJ7_QItc,13232
-kea2_python-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kea2_python-0.1.0.dist-info/entry_points.txt,sha256=mFX06TyxXiUAJQ6JZn8QHzfn8n5R8_KJ5W-pTm_fRCA,39
-kea2_python-0.1.0.dist-info/top_level.txt,sha256=TsgNH4PQoNOVhegpO7AcjutMVWp6Z4KDL1pBH9FnMmk,5
-kea2_python-0.1.0.dist-info/RECORD,,
+kea2_python-0.1.1.dist-info/licenses/LICENSE,sha256=nM9PPjcsXVo5SzNsjRqWgA-gdJlwqZZcRDSC6Qf6bVE,2034
+kea2_python-0.1.1.dist-info/METADATA,sha256=XFsmboCjYk4AwwBBeijCvT7iPAr-shBsx-COPqst1o0,13232
+kea2_python-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kea2_python-0.1.1.dist-info/entry_points.txt,sha256=mFX06TyxXiUAJQ6JZn8QHzfn8n5R8_KJ5W-pTm_fRCA,39
+kea2_python-0.1.1.dist-info/top_level.txt,sha256=TsgNH4PQoNOVhegpO7AcjutMVWp6Z4KDL1pBH9FnMmk,5
+kea2_python-0.1.1.dist-info/RECORD,,