epicknex/hererocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle unicode in output correctly in tests under py2

Browse Source
This commit is contained in:
Peter Melnichenko 2016-10-16 17:53:54 +03:00
parent fba0462779
commit 012172c020
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/cli_test.py
View File

@ -29,7 +29,7 @@ class TestCLI(unittest.TestCase):
args[0] += ".bat" args[0] += ".bat"
process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
output = process.communicate()[0].decode("UTF-8") output = process.communicate()[0]
if process.returncode != 0: if process.returncode != 0:
raise AssertionError("Error running command '{}': code {}, output:\n{}".format( raise AssertionError("Error running command '{}': code {}, output:\n{}".format(
@ -39,6 +39,8 @@ class TestCLI(unittest.TestCase):
actual_output_lines = output.splitlines() actual_output_lines = output.splitlines()
for expected_output_line in expected_output_lines: for expected_output_line in expected_output_lines:
expected_output_line = expected_output_line.encode("UTF-8")
if not any(expected_output_line in actual_output_line for actual_output_line in actual_output_lines): if not any(expected_output_line in actual_output_line for actual_output_line in actual_output_lines):
raise AssertionError("Expected to see '{}' in output of command '{}', got output:\n{}".format( raise AssertionError("Expected to see '{}' in output of command '{}', got output:\n{}".format(
expected_output_line, " ".join(args), output)) expected_output_line, " ".join(args), output))