RemoteOperations::exec_command must not raise an exception when 'expect_error' is True (#159)

dmitry-lipetsk · dmitry-lipetsk · commit 45cfbf738e1f · 2024-12-07T23:26:04.000+03:00
This commit fixes an issue #159.
diff --git a/testgres/operations/remote_ops.py b/testgres/operations/remote_ops.py
@@ -83,26 +83,26 @@ def exec_command(self, cmd, wait_exit=False, verbose=False, expect_error=False,
 
         exit_status = process.returncode
 
-        if encoding:
-            result = result.decode(encoding)
-            error = error.decode(encoding)
-
-        if expect_error:
-            raise Exception(result, error)
+        assert type(result) == bytes  # noqa: E721
+        assert type(error) == bytes  # noqa: E721
 
         if not error:
-            error_found = 0
+            error_found = False
         else:
-            error = normalize_error(error)
             error_found = exit_status != 0 or any(
-                marker in error for marker in ['error', 'Permission denied', 'fatal', 'No such file or directory']
+                marker in error for marker in [b'error', b'Permission denied', b'fatal', b'No such file or directory']
             )
 
-        if not ignore_errors and error_found:
-            if isinstance(error, bytes):
-                message = b"Utility exited with non-zero code. Error: " + error
-            else:
-                message = f"Utility exited with non-zero code. Error: {error}"
+        assert type(error_found) == bool  # noqa: E721
+
+        if encoding:
+            result = result.decode(encoding)
+            error = error.decode(encoding)
+
+        if not ignore_errors and error_found and not expect_error:
+            error = normalize_error(error)
+            assert type(error) == str  # noqa: E721
+            message = "Utility exited with non-zero code. Error: " + error
             raise ExecUtilException(message=message, command=cmd, exit_code=exit_status, out=result)
 
         if verbose:
