refactor: logging and killing processes

Author: dtopuzov

core/base_test/tns_test.py

@@ -50,8 +50,9 @@ def tearDown(self):
         Tns.kill()
 
         for process in TestContext.STARTED_PROCESSES:
-            Log.info("Kill Process: " + os.linesep + process.commandline)
-            Process.kill_pid(process.pid)
+            if Process.is_running(process.pid):
+                Log.info("Kill Process: " + os.linesep + process.commandline)
+                Process.kill_pid(process.pid)
 
         # Analise test result
         result = self._resultForDoCleanups

core/utils/device/device.py

@@ -57,7 +57,7 @@ def is_text_visible(self, text):
 
         # Retry find with ORC if macOS automation fails
         if not is_visible:
-            actual_text = self.get_text()
+            actual_text = self.get_text().encode('utf-8').strip()
             if text in actual_text:
                 is_visible = True
             else:

core/utils/device/simctl.py

@@ -4,7 +4,7 @@
 
 from core.log.log import Log
 from core.utils.file_utils import File
-from core.utils.process import Run
+from core.utils.process import Run, Process
 from core.utils.wait import Wait
 
 
@@ -19,8 +19,10 @@ def __run_simctl_command(command, wait=True, timeout=30):
     # noinspection PyBroadException
     @staticmethod
     def __get_simulators():
-        logs = Simctl.__run_simctl_command(command='list --json devices', wait=False).log_file
+        result = Simctl.__run_simctl_command(command='list --json devices', wait=False)
+        logs = result.log_file
         found = Wait.until(lambda: 'iPhone' in File.read(logs), timeout=30)
+        Process.kill_pid(result.pid)
         if found:
             json_content = '{' + File.read(logs).split('{', 1)[-1]
             try:

core/utils/file_utils.py

@@ -13,7 +13,7 @@ class Folder(object):
     @staticmethod
     def clean(folder):
         if Folder.exists(folder=folder):
-            Log.info("Clean folder: " + folder)
+            Log.debug("Clean folder: " + folder)
             try:
                 shutil.rmtree(folder)
             except OSError as e:
@@ -33,7 +33,7 @@ def exists(folder):
 
     @staticmethod
     def create(folder):
-        Log.info("Create folder: " + folder)
+        Log.debug("Create folder: " + folder)
         if not os.path.exists(folder):
             try:
                 os.makedirs(folder)

core/utils/process.py

@@ -82,7 +82,15 @@ def command(cmd, cwd=Settings.TEST_RUN_HOME, wait=True, fail_safe=False, registe
 # noinspection PyBroadException,PyUnusedLocal
 class Process(object):
     @staticmethod
-    def is_running(proc_name):
+    def is_running(pid):
+        try:
+            os.kill(pid, 0)
+            return True
+        except OSError:
+            return False
+
+    @staticmethod
+    def is_running_by_name(proc_name):
         """
         Check if process is running.
         """
@@ -135,7 +143,7 @@ def wait_until_running(proc_name, timeout=60):
         end_time = time.time() + timeout
         while not running:
             time.sleep(5)
-            running = Process.is_running(proc_name)
+            running = Process.is_running_by_name(proc_name)
             if running:
                 running = True
                 break
@@ -189,6 +197,7 @@ def kill_pid(pid):
         try:
             p = psutil.Process(pid)
             p.terminate()
+            Log.log(level=logging.DEBUG, message="Process has been killed: {0}{1}".format(os.linesep, p.cmdline()))
         except Exception:
             pass
 

core/utils/process_info.py

@@ -1,6 +1,3 @@
-from psutil import Process
-
-
 class ProcessInfo(object):
     def __init__(self, cmd=None, pid=None, exit_code=None, output='', log_file=None, complete=True, duration=None):
         self.commandline = cmd
@@ -10,8 +7,3 @@ def __init__(self, cmd=None, pid=None, exit_code=None, output='', log_file=None,
         self.log_file = log_file
         self.complete = complete
         self.duration = duration
-
-    @classmethod
-    def kill(cls, pid):
-        p = Process(pid)
-        p.terminate()

products/angular/ng.py

@@ -84,6 +84,7 @@ def serve(project=Settings.AppName.DEFAULT, verify=True):
         result = NG.exec_command(command='serve', cwd=project_path, wait=False)
         if verify:
             compiled = Wait.until(lambda: 'Compiled successfully' in File.read(result.log_file))
+            Process.kill_pid(result.pid)
             assert compiled, 'Failed to compile NG app at {0}'.format(project)
         return result