traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#22731 test_capi test fails because of mismatched newlines

This commit is contained in:
Steve Dower 2014-11-01 15:11:05 -07:00
parent 1be0c61882
commit 86e9deb5aa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_capi.py
View File

@ -304,12 +304,13 @@ class EmbeddingTests(unittest.TestCase):
cmd.extend(args) cmd.extend(args)
p = subprocess.Popen(cmd, p = subprocess.Popen(cmd,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE,
universal_newlines=True)
(out, err) = p.communicate() (out, err) = p.communicate()
self.assertEqual(p.returncode, 0, self.assertEqual(p.returncode, 0,
"bad returncode %d, stderr is %r" % "bad returncode %d, stderr is %r" %
(p.returncode, err)) (p.returncode, err))
return out.decode("latin1"), err.decode("latin1") return out, err
def test_subinterps(self): def test_subinterps(self):
# This is just a "don't crash" test # This is just a "don't crash" test
@ -339,7 +340,7 @@ class EmbeddingTests(unittest.TestCase):
expected_errors = sys.__stdout__.errors expected_errors = sys.__stdout__.errors
expected_stdin_encoding = sys.__stdin__.encoding expected_stdin_encoding = sys.__stdin__.encoding
expected_pipe_encoding = self._get_default_pipe_encoding() expected_pipe_encoding = self._get_default_pipe_encoding()
expected_output = os.linesep.join([ expected_output = '\n'.join([
"--- Use defaults ---", "--- Use defaults ---",
"Expected encoding: default", "Expected encoding: default",
"Expected errors: default", "Expected errors: default",