feat: add fail_safe to Run.command()

Author: dtopuzov

core/utils/device/adb.py

@@ -14,12 +14,12 @@
 # noinspection PyShadowingBuiltins
 class Adb(object):
     @staticmethod
-    def __run_adb_command(command, id=None, wait=True, log_level=logging.DEBUG):
+    def __run_adb_command(command, id=None, wait=True, timeout=60, fail_safe=False, log_level=logging.DEBUG):
         if id is None:
             command = '{0} {1}'.format(ADB_PATH, command)
         else:
             command = '{0} -s {1} {2}'.format(ADB_PATH, id, command)
-        return Run.command(cmd=command, wait=wait, log_level=log_level)
+        return Run.command(cmd=command, wait=wait, timeout=timeout, fail_safe=fail_safe, log_level=log_level)
 
     @staticmethod
     def __get_ids(include_emulator=False):
@@ -61,7 +61,7 @@ def is_running(id):
             command = "shell dumpsys window windows | findstr mFocusedApp"
         else:
             command = "shell dumpsys window windows | grep -E 'mFocusedApp'"
-        result = Adb.__run_adb_command(command=command, id=id)
+        result = Adb.__run_adb_command(command=command, id=id, timeout=10, fail_safe=True)
         if 'ActivityRecord' in result.output:
             return True
         else:

core/utils/process.py

@@ -17,7 +17,7 @@
 
 class Run(object):
     @staticmethod
-    def command(cmd, cwd=Settings.TEST_RUN_HOME, wait=True, register_for_cleanup=True, timeout=600,
+    def command(cmd, cwd=Settings.TEST_RUN_HOME, wait=True, fail_safe=False, register_for_cleanup=True, timeout=600,
                 log_level=logging.DEBUG):
         # Init result values
         log_file = None
@@ -51,7 +51,10 @@ def command(cmd, cwd=Settings.TEST_RUN_HOME, wait=True, register_for_cleanup=Tru
                     p.wait(timeout=timeout)
                 except psutil.TimeoutExpired:
                     p.kill()
-                    raise
+                    if not fail_safe:
+                        raise
+                    else:
+                        Log.error('Command reached timeout limit: {0}'.format(cmd))
             out, err = process.communicate()
             output = (str(out) + os.linesep + str(err)).rstrip()
             complete = True