mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 08:34:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix test_pty.py.

Browse source
This commit is contained in:
Walter Dörwald 2007-05-29 18:57:42 +00:00
parent c02571484b
commit 812d8341ea
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_pty.py
View file

@ -30,12 +30,12 @@ def normalize_output(data):
# from someone more knowledgable. # from someone more knowledgable.
# OSF/1 (Tru64) apparently turns \n into \r\r\n. # OSF/1 (Tru64) apparently turns \n into \r\r\n.
if data.endswith('\r\r\n'): if data.endswith(b'\r\r\n'):
return data.replace('\r\r\n', '\n') return data.replace(b'\r\r\n', b'\n')
# IRIX apparently turns \n into \r\n. # IRIX apparently turns \n into \r\n.
if data.endswith('\r\n'): if data.endswith(b'\r\n'):
return data.replace('\r\n', '\n') return data.replace(b'\r\n', b'\n')
return data return data
@ -92,14 +92,14 @@ class PtyTest(unittest.TestCase):
debug("Writing to slave_fd") debug("Writing to slave_fd")
os.write(slave_fd, TEST_STRING_1) os.write(slave_fd, TEST_STRING_1)
s1 = os.read(master_fd, 1024) s1 = os.read(master_fd, 1024)
self.assertEquals('I wish to buy a fish license.\n', self.assertEquals(b'I wish to buy a fish license.\n',
normalize_output(s1)) normalize_output(s1))
debug("Writing chunked output") debug("Writing chunked output")
os.write(slave_fd, TEST_STRING_2[:5]) os.write(slave_fd, TEST_STRING_2[:5])
os.write(slave_fd, TEST_STRING_2[5:]) os.write(slave_fd, TEST_STRING_2[5:])
s2 = os.read(master_fd, 1024) s2 = os.read(master_fd, 1024)
self.assertEquals('For my pet fish, Eric.\n', normalize_output(s2)) self.assertEquals(b'For my pet fish, Eric.\n', normalize_output(s2))
os.close(slave_fd) os.close(slave_fd)
os.close(master_fd) os.close(master_fd)
@ -157,7 +157,7 @@ class PtyTest(unittest.TestCase):
break break
if not data: if not data:
break break
sys.stdout.write(data.replace('\r\n', '\n')) sys.stdout.write(data.replace('\r\n', '\n').decode('ascii'))
##line = os.read(master_fd, 80) ##line = os.read(master_fd, 80)
##lines = line.replace('\r\n', '\n').split('\n') ##lines = line.replace('\r\n', '\n').split('\n')