Merge pull request #71 from DataKitchen/fix-retry

fix: The raise_on_non_zero arg wasn't being forwarded when using retries

Author: rboni-dk

dk-installer.py

@@ -613,7 +613,7 @@ def run_cmd_retries(self, *cmd, timeout, retries, raise_on_non_zero=True, env=No
         cmd_fail_exception = None
         while retries > 0:
             try:
-                with self.start_cmd(*cmd, env=env, **popen_args) as (proc, *_):
+                with self.start_cmd(*cmd, raise_on_non_zero=raise_on_non_zero, env=env, **popen_args) as (proc, *_):
                     try:
                         proc.wait(timeout=timeout)
                     except subprocess.TimeoutExpired as e:

tests/test_action.py

@@ -127,7 +127,7 @@ def test_run_cmd_retries(action, start_cmd_mock, proc_mock):
 
     assert start_cmd_mock.call_count == 4
     assert proc_mock.wait.call_count == 4
-    start_cmd_mock.assert_called_with("cmd", env=None)
+    start_cmd_mock.assert_called_with("cmd", env=None, raise_on_non_zero=True)
     proc_mock.kill.assert_called_once_with()
     proc_mock.wait.assert_called_with(timeout=5)
 

tests/test_tg_install.py

@@ -25,7 +25,7 @@ def tg_install_action(action_cls, args_mock, tmp_data_folder, start_cmd_mock):
 def test_tg_install(tg_install_action, start_cmd_mock, stdout_mock, tmp_data_folder, compose_path):
     tg_install_action.execute()
 
-    docker_call_retry = partial(call, "docker", "compose", "-f", compose_path, env=None)
+    docker_call_retry = partial(call, "docker", "compose", "-f", compose_path, raise_on_non_zero=True, env=None)
     docker_call = partial(docker_call_retry, raise_on_non_zero=True)
 
     start_cmd_mock.assert_has_calls(

tests/test_tg_upgrade.py

@@ -80,7 +80,7 @@ def test_tg_upgrade(tg_upgrade_action, compose_path, start_cmd_mock, tg_upgrade_
         [
             call(*compose_args, "exec", "engine", "testgen", "--help", **compose_kwargs),
             call(*compose_args, "down", **compose_kwargs),
-            call(*compose_args, "pull", "--policy", "always", env=None),
+            call(*compose_args, "pull", "--policy", "always", raise_on_non_zero=True, env=None),
             call(*compose_args, "up", "--wait", **compose_kwargs),
             call(*compose_args, "exec", "engine", "testgen", "upgrade-system-version", **compose_kwargs),
         ],