Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #20520: Fixed readline test in test_codecs.

This commit is contained in:
Serhiy Storchaka 2014-02-06 09:26:56 +02:00
parent 22d415cf19
commit 5b4fab1ad7
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Lib/test/test_codecs.py
View File

@ -146,19 +146,20 @@ class ReadTest(MixInCheckStateHandling):
self.assertEqual(readalllines(s, True, 10), sexpected) self.assertEqual(readalllines(s, True, 10), sexpected)
self.assertEqual(readalllines(s, False, 10), sexpectednoends) self.assertEqual(readalllines(s, False, 10), sexpectednoends)
lineends = ("\n", "\r\n", "\r", "\u2028")
# Test long lines (multiple calls to read() in readline()) # Test long lines (multiple calls to read() in readline())
vw = [] vw = []
vwo = [] vwo = []
for (i, lineend) in enumerate("\n \r\n \r \u2028".split()): for (i, lineend) in enumerate(lineends):
vw.append((i*200)*"\3042" + lineend) vw.append((i*200+200)*"\u3042" + lineend)
vwo.append((i*200)*"\3042") vwo.append((i*200+200)*"\u3042")
self.assertEqual(readalllines("".join(vw), True), "".join(vw)) self.assertEqual(readalllines("".join(vw), True), "|".join(vw))
self.assertEqual(readalllines("".join(vw), False),"".join(vwo)) self.assertEqual(readalllines("".join(vw), False), "|".join(vwo))
# Test lines where the first read might end with \r, so the # Test lines where the first read might end with \r, so the
# reader has to look ahead whether this is a lone \r or a \r\n # reader has to look ahead whether this is a lone \r or a \r\n
for size in range(80): for size in range(80):
for lineend in "\n \r\n \r \u2028".split(): for lineend in lineends:
s = 10*(size*"a" + lineend + "xxx\n") s = 10*(size*"a" + lineend + "xxx\n")
reader = getreader(s) reader = getreader(s)
for i in range(10): for i in range(10):
@ -166,12 +167,20 @@ class ReadTest(MixInCheckStateHandling):
reader.readline(keepends=True), reader.readline(keepends=True),
size*"a" + lineend, size*"a" + lineend,
) )
self.assertEqual(
reader.readline(keepends=True),
"xxx\n",
)
reader = getreader(s) reader = getreader(s)
for i in range(10): for i in range(10):
self.assertEqual( self.assertEqual(
reader.readline(keepends=False), reader.readline(keepends=False),
size*"a", size*"a",
) )
self.assertEqual(
reader.readline(keepends=False),
"xxx",
)
def test_mixed_readline_and_read(self): def test_mixed_readline_and_read(self):
lines = ["Humpty Dumpty sat on a wall,\n", lines = ["Humpty Dumpty sat on a wall,\n",