Commit 7e49528b authored by Jason Madden's avatar Jason Madden

Another platform difference.

parent 94e6e809
...@@ -10,6 +10,7 @@ import gc ...@@ -10,6 +10,7 @@ import gc
PYPY = hasattr(sys, 'pypy_version_info') PYPY = hasattr(sys, 'pypy_version_info')
PY3 = sys.version_info[0] >= 3
if subprocess.mswindows: if subprocess.mswindows:
...@@ -90,14 +91,19 @@ class Test(greentest.TestCase): ...@@ -90,14 +91,19 @@ class Test(greentest.TestCase):
bufsize=1) bufsize=1)
try: try:
stdout = p.stdout.read() stdout = p.stdout.read()
if PY3 and isinstance(stdout, bytes):
# OS X gives us binary back from stdout.read, but linux (travis ci)
# gives us text...text is correct because we're in universal newline
# mode
stdout = stdout.decode('ascii')
if python_universal_newlines: if python_universal_newlines:
# Interpreter with universal newline support # Interpreter with universal newline support
self.assertEqual(stdout, self.assertEqual(stdout,
b"line1\nline2\nline3\nline4\nline5\nline6") "line1\nline2\nline3\nline4\nline5\nline6")
else: else:
# Interpreter without universal newline support # Interpreter without universal newline support
self.assertEqual(stdout, self.assertEqual(stdout,
b"line1\nline2\rline3\r\nline4\r\nline5\nline6") "line1\nline2\rline3\r\nline4\r\nline5\nline6")
finally: finally:
p.stdout.close() p.stdout.close()
...@@ -118,14 +124,19 @@ class Test(greentest.TestCase): ...@@ -118,14 +124,19 @@ class Test(greentest.TestCase):
bufsize=1) bufsize=1)
try: try:
stdout = p.stdout.read() stdout = p.stdout.read()
if PY3 and isinstance(stdout, bytes):
# OS X gives us binary back from stdout.read, but linux (travis ci)
# gives us text...text is correct because we're in universal newline
# mode
stdout = stdout.decode('ascii')
if python_universal_newlines: if python_universal_newlines:
# Interpreter with universal newline support # Interpreter with universal newline support
self.assertEqual(stdout, self.assertEqual(stdout,
b"line1\nline2\nline3\nline4\nline5\nline6") "line1\nline2\nline3\nline4\nline5\nline6")
else: else:
# Interpreter without universal newline support # Interpreter without universal newline support
self.assertEqual(stdout, self.assertEqual(stdout,
b"line1\nline2\rline3\r\nline4\r\nline5\nline6") "line1\nline2\rline3\r\nline4\r\nline5\nline6")
finally: finally:
p.stdout.close() p.stdout.close()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment