diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-02 01:32:36 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-02 01:32:36 -0300 |
| commit | 80fdad64055e17bd8b88b08353c0ea69105b2241 (patch) | |
| tree | 5acba8e245a1d93790f616329621b6feacf12657 /tests/21_test_command_wrappers.py | |
| parent | 1b5a47f4bda5d8809998750c3a35b4e02c8b2851 (diff) | |
command_wrappers: port to Python3
Diffstat (limited to 'tests/21_test_command_wrappers.py')
| -rw-r--r-- | tests/21_test_command_wrappers.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/21_test_command_wrappers.py b/tests/21_test_command_wrappers.py index fd442c82..3ad3290c 100644 --- a/tests/21_test_command_wrappers.py +++ b/tests/21_test_command_wrappers.py @@ -9,7 +9,7 @@ from gbp.command_wrappers import Command, CommandExecFailed from . testutils import GbpLogTester -def patch_popen(stdout='', stderr='', returncode=1): +def patch_popen(stdout=b'', stderr=b'', returncode=1): """Decorator to easily set the return value of popen.communicate()""" def patch_popen_decorator(func): @functools.wraps(func) @@ -32,7 +32,7 @@ class TestCommandWrapperFailures(unittest.TestCase, GbpLogTester): def tearDown(self): self.log_tester._capture_log(False) - @patch_popen(stdout='', stderr='', returncode=1) + @patch_popen(stdout=b'', stderr=b'', returncode=1) def test_log_default_error_msg(self, create_mock): with self.assertRaises(CommandExecFailed): self.false.__call__() @@ -41,7 +41,7 @@ class TestCommandWrapperFailures(unittest.TestCase, GbpLogTester): self.assertEqual(self.false.stderr, '') self.assertEqual(self.false.stdout, '') - @patch_popen(stdout='', stderr='we have a problem', returncode=1) + @patch_popen(stdout=b'', stderr=b'we have a problem', returncode=1) def test_log_use_stderr_for_err_message(self, create_mock): self.false.capture_stderr = True self.false.run_error = "Erpel {stderr}" @@ -52,7 +52,7 @@ class TestCommandWrapperFailures(unittest.TestCase, GbpLogTester): self.assertEqual(self.false.stderr, 'we have a problem') self.assertEqual(self.false.stdout, '') - @patch_popen(stdout='we have a problem', stderr='', returncode=1) + @patch_popen(stdout=b'we have a problem', stderr=b'', returncode=1) def test_log_use_stdout_for_err_message(self, create_mock): self.false.capture_stdout = True self.false.run_error = "Erpel {stdout}" @@ -70,7 +70,7 @@ class TestCommandWrapperFailures(unittest.TestCase, GbpLogTester): self.log_tester._check_log(0, "gbp:error: AFAIK execution failed: .Errno 2. No such file or directory") self.assertEqual(self.false.retcode, 1) - @patch_popen(stderr='we have a problem', returncode=1) + @patch_popen(stderr=b'we have a problem', returncode=1) def test_log_use_err_or_reason_for_error_messge_error(self, create_mock): self.false.run_error = "Erpel {stderr_or_reason}" with self.assertRaises(CommandExecFailed): |