Fix initdb error on Windows

vshepard · vshepard · commit 019cc4c21899 · 2023-12-14T14:21:55.000+01:00
diff --git a/testgres/operations/local_ops.py b/testgres/operations/local_ops.py
@@ -55,50 +55,41 @@ def exec_command(self, cmd, wait_exit=False, verbose=False,
         - proc: The process to use for subprocess creation.
         :return: The output of the subprocess.
         """
-        if os.name == 'nt':
-            with tempfile.NamedTemporaryFile() as buf:
-                process = subprocess.Popen(cmd, stdout=buf, stderr=subprocess.STDOUT)
-                process.communicate()
-                buf.seek(0)
-                result = buf.read().decode(encoding)
-            return result
+        process = subprocess.Popen(
+            cmd,
+            shell=shell,
+            stdin=stdin,
+            stdout=stdout,
+            stderr=stderr,
+            text=text
+        )
+
+        if get_process:
+            return process
+
+        try:
+            result, error = process.communicate(input=input, timeout=timeout)
+        except subprocess.TimeoutExpired:
+            process.kill()
+            raise ExecUtilException("Command timed out after {} seconds.".format(timeout))
+        exit_status = process.returncode
+
+        if encoding:
+            result = result.decode(encoding) if result else ''
+            error = error.decode(encoding) if error else ''
+
+        if exit_status != 0 or (expect_error and error):
+            if exit_status == 0:
+                exit_status = 1
+            raise ExecUtilException(message='Utility exited with non-zero code. Error `{}`'.format(error),
+                                    command=cmd,
+                                    exit_code=exit_status,
+                                    out=result)
+
+        if verbose:
+            return exit_status, result, error
         else:
-            process = subprocess.Popen(
-                cmd,
-                shell=shell,
-                stdout=stdout,
-                stderr=stderr,
-            )
-            if get_process:
-                return process
-
-            try:
-                result, error = process.communicate(input, timeout=timeout)
-            except subprocess.TimeoutExpired:
-                process.kill()
-                raise ExecUtilException("Command timed out after {} seconds.".format(timeout))
-            exit_status = process.returncode
-
-            error_found = exit_status != 0 or any(marker in error for marker in error_markers)
-
-            if encoding:
-                result = result.decode(encoding)
-                error = error.decode(encoding)
-
-            if expect_error:
-                raise Exception(result, error)
-
-            if exit_status != 0 or error_found:
-                if exit_status == 0:
-                    exit_status = 1
-                raise ExecUtilException(message='Utility exited with non-zero code. Error `{}`'.format(error),
-                                        command=cmd,
-                                        exit_code=exit_status,
-                                        out=result)
-            if verbose:
-                return exit_status, result, error
-            else:
-                return result
+            return result
 
     # Environment setup
     def environ(self, var_name):
