mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix universal newlines test to avoid the newline translation done by sys.stdout.

Browse source
This commit is contained in:
Antoine Pitrou 2012-08-05 00:23:40 +02:00
parent 894375a2fd
commit ec2d26930c
1 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Lib/test/test_subprocess.py
View file

@ -476,21 +476,22 @@ class ProcessTestCase(BaseTestCase):
def test_universal_newlines(self): def test_universal_newlines(self):
p = subprocess.Popen([sys.executable, "-c", p = subprocess.Popen([sys.executable, "-c",
'import sys,os;' + SETBINARY + 'import sys,os;' + SETBINARY +
'sys.stdout.write(sys.stdin.readline());' 'buf = sys.stdout.buffer;'
'sys.stdout.flush();' 'buf.write(sys.stdin.readline().encode());'
'sys.stdout.write("line2\\n");' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(b"line2\\n");'
'sys.stdout.write(sys.stdin.read());' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(sys.stdin.read().encode());'
'sys.stdout.write("line4\\n");' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(b"line4\\n");'
'sys.stdout.write("line5\\r\\n");' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(b"line5\\r\\n");'
'sys.stdout.write("line6\\r");' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(b"line6\\r");'
'sys.stdout.write("\\nline7");' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(b"\\nline7");'
'sys.stdout.write("\\nline8");'], 'buf.flush();'
'buf.write(b"\\nline8");'],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
universal_newlines=1) universal_newlines=1)
@ -510,17 +511,18 @@ class ProcessTestCase(BaseTestCase):
# universal newlines through communicate() # universal newlines through communicate()
p = subprocess.Popen([sys.executable, "-c", p = subprocess.Popen([sys.executable, "-c",
'import sys,os;' + SETBINARY + 'import sys,os;' + SETBINARY +
'sys.stdout.write("line2\\n");' 'buf = sys.stdout.buffer;'
'sys.stdout.flush();' 'buf.write(b"line2\\n");'
'sys.stdout.write("line4\\n");' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(b"line4\\n");'
'sys.stdout.write("line5\\r\\n");' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(b"line5\\r\\n");'
'sys.stdout.write("line6\\r");' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(b"line6\\r");'
'sys.stdout.write("\\nline7");' 'buf.flush();'
'sys.stdout.flush();' 'buf.write(b"\\nline7");'
'sys.stdout.write("\\nline8");'], 'buf.flush();'
'buf.write(b"\\nline8");'],
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
universal_newlines=1) universal_newlines=1)