Changeset 40897 for branches/ipp-132_automate_jira_conf_backups/utils/python/subprocess_utils.py

Timestamp:

Oct 3, 2019, 11:51:21 AM (7 years ago)

Author:

fairlamb

Message:

Better errors, chmod wrapper, fixed config loading and tests

File:

• branches/ipp-132_automate_jira_conf_backups/utils/python/subprocess_utils.py (modified) (6 diffs)

branches/ipp-132_automate_jira_conf_backups/utils/python/subprocess_utils.py

@@ -2 +2 @@
 
 # Plans are to flesh this out a bit more to make some smarter copying etc
+from generic_utils import ValidationError
 
 
@@ -10 +11 @@
 def _args_check(args, function_name):
     if args is None:
-        print("Error: no arguments provided in ", function_name)
-        return 2
+        raise ValidationError(f"Error: no arguments provided in {function_name}")
     if type(args) != list or len(args) == 0:
-        print("Error: at least 1 arg must be given for ", function_name)
-        return 2
+        raise ValidationError(f"Error: no arguments provided in {function_name}")
     return 0
 
@@ -20 +19 @@
 def cp_wrapper(args: [str]):
     if args is None:
-        return 2
+        raise ValidationError(f"Error: no arguments provided to {cp_wrapper.__name__}")
     command_and_args = ["cp"] + args
     return simple_unix_wrapper(command_and_args)
@@ -27 +26 @@
 def tar_wrapper(args: [str]):
     if args is None:
-        return 2
+        raise ValidationError(f"Error: no arguments provided to {tar_wrapper.__name__}")
     command_and_args = ["tar"] + args
     return simple_unix_wrapper(command_and_args)
@@ -34 +33 @@
 def chmod_wrapper(args: [str]):
     if args is None:
-        return 2
+        raise ValidationError(f"Error: no arguments provided to {chmod_wrapper.__name__}")
     command_and_args = ["chmod"] + args
     return simple_unix_wrapper(command_and_args)
@@ -44 +43 @@
 Only a single command should be called.
     """
-    arg_check = _args_check(command_and_args, simple_unix_wrapper.__name__)
-    if arg_check != 0:
-        return arg_check
+    _args_check(command_and_args, simple_unix_wrapper.__name__)
 
     try:
         subprocess.check_call(command_and_args)
-    except subprocess.CalledProcessError as e:
-        print("CalledProcessError in python subprocess: ")
-        print(e)
-        return 2
+    except (subprocess.CalledProcessError) as cpe:
+        raise SubprocessError(f"{type(cpe)} in python simple_unix_wrapper") from cpe
+    except (ValidationError) as ve:
+        raise ValidationError(f"{type(ve)} in python simple_unix_wrapper") from ve
     return 0