diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-31 12:55:20 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-31 12:55:20 -0500 |
commit | 88e2f9e68f104ea3797f7a0ffaeab7171a2eb221 (patch) | |
tree | 9a5c24b875caf53fdb2fe901875600440e2c8492 /testsuite | |
parent | 7c274b35552e631d7b5359b13192e7463eace645 (diff) | |
download | bcfg2-88e2f9e68f104ea3797f7a0ffaeab7171a2eb221.tar.gz bcfg2-88e2f9e68f104ea3797f7a0ffaeab7171a2eb221.tar.bz2 bcfg2-88e2f9e68f104ea3797f7a0ffaeab7171a2eb221.zip |
testsuite: Fix output for python3
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/Testschema/test_schema.py | 2 | ||||
-rw-r--r-- | testsuite/Testsrc/test_code_checks.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/Testschema/test_schema.py b/testsuite/Testschema/test_schema.py index ddfe4775f..cd9b74cdf 100644 --- a/testsuite/Testschema/test_schema.py +++ b/testsuite/Testschema/test_schema.py @@ -41,7 +41,7 @@ class TestSchemas(Bcfg2TestCase): xmllint = Popen(['xmllint', '--xinclude', '--noout', '--schema', self.schema_url] + schemas, stdout=PIPE, stderr=STDOUT) - print(xmllint.communicate()[0]) + print(xmllint.communicate()[0].decode()) self.assertEqual(xmllint.wait(), 0) def test_duplicates(self): diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py index 255c1b81a..22db0b331 100644 --- a/testsuite/Testsrc/test_code_checks.py +++ b/testsuite/Testsrc/test_code_checks.py @@ -188,7 +188,7 @@ class CodeTestCase(Bcfg2TestCase): cmd = self.command + self.full_args + extra_args + \ [os.path.join(srcpath, f) for f in files] proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, env=self.get_env()) - print(proc.communicate()[0]) + print(proc.communicate()[0].decode()) self.assertEqual(proc.wait(), 0) def _test_errors(self, files, extra_args=None): @@ -200,7 +200,7 @@ class CodeTestCase(Bcfg2TestCase): cmd = self.command + self.error_args + extra_args + \ [os.path.join(srcpath, f) for f in files] proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, env=self.get_env()) - print(proc.communicate()[0]) + print(proc.communicate()[0].decode()) self.assertEqual(proc.wait(), 0) @skipIf(not os.path.exists(srcpath), "%s does not exist" % srcpath) @@ -323,7 +323,7 @@ class TestPylint(CodeTestCase): args = self.command + self.error_args + extra_args + \ [os.path.join(srcpath, p) for p in files] pylint = Popen(args, stdout=PIPE, stderr=STDOUT, env=self.get_env()) - output = pylint.communicate()[0] + output = pylint.communicate()[0].decode() rv = pylint.wait() for line in output.splitlines(): |