diff options
| -rw-r--r-- | test/utils.py | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/test/utils.py b/test/utils.py index 3eefca32..5e52147b 100644 --- a/test/utils.py +++ b/test/utils.py @@ -43,8 +43,6 @@ class Executable(object): self.basename = kwargs.get('basename', os.path.basename(exe)).replace('.exe', '') self.error_cmdline = kwargs.get('error_cmdline', True) - self.clean_stdout = kwargs.get('clean_stdout') - self.clean_stderr = kwargs.get('clean_stderr') self.stdout_handle = self._ForwardHandle(kwargs.get('forward_stdout')) self.stderr_handle = self._ForwardHandle(kwargs.get('forward_stderr')) self.verbose = False @@ -67,24 +65,19 @@ class Executable(object): stderr = '' error = None try: - process = subprocess.Popen(cmd, stdout=self.stdout_handle, - stderr=self.stderr_handle, **kwargs) - stdout, stderr = process.communicate() - if stdout: - stdout = stdout.decode('utf-8', 'ignore') - if stderr: - stderr = stderr.decode('utf-8', 'ignore') - if self.clean_stdout: - stdout = self.clean_stdout(stdout) - if self.clean_stderr: - stderr = self.clean_stderr(stderr) + process = subprocess.run(cmd, check=False, stdout=self.stdout_handle, + stderr=self.stderr_handle, **kwargs) + if process.stdout: + stdout = process.stdout.decode('utf-8', 'ignore') + if process.stdout: + stderr = process.stderr.decode('utf-8', 'ignore') if process.returncode < 0: # Terminated by signal signame = SIGNAMES.get(-process.returncode, '<unknown>') error = Error('Signal raised running "%s": %s\n%s' % (err_cmd_str, signame, stderr)) elif process.returncode > 0: - error = Error('Error running "%s":\n%s' % (err_cmd_str, stderr)) + error = Error('Error running "%s" (%d):\n%s' % (err_cmd_str, process.returncode, stderr)) except OSError as e: error = Error('Error running "%s": %s' % (err_cmd_str, str(e))) return stdout, stderr, error |