mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-22 14:42:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Simplify line-oriented tests in test_bz2.

Browse source
This commit is contained in:
Nadeem Vawda 2011-05-30 02:09:54 +02:00
parent f3ecb83822
commit 72e58651b2
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/test/test_bz2.py
View file

@ -163,43 +163,37 @@ class BZ2FileTest(BaseTest):
self.createTempFile() self.createTempFile()
with BZ2File(self.filename) as bz2f: with BZ2File(self.filename) as bz2f:
self.assertRaises(TypeError, bz2f.readline, None) self.assertRaises(TypeError, bz2f.readline, None)
sio = BytesIO(self.TEXT) for line in self.TEXT_LINES:
for line in sio.readlines():
self.assertEqual(bz2f.readline(), line) self.assertEqual(bz2f.readline(), line)
def testReadLineMultiStream(self): def testReadLineMultiStream(self):
self.createTempFile(streams=5) self.createTempFile(streams=5)
with BZ2File(self.filename) as bz2f: with BZ2File(self.filename) as bz2f:
self.assertRaises(TypeError, bz2f.readline, None) self.assertRaises(TypeError, bz2f.readline, None)
sio = BytesIO(self.TEXT * 5) for line in self.TEXT_LINES * 5:
for line in sio.readlines():
self.assertEqual(bz2f.readline(), line) self.assertEqual(bz2f.readline(), line)
def testReadLines(self): def testReadLines(self):
self.createTempFile() self.createTempFile()
with BZ2File(self.filename) as bz2f: with BZ2File(self.filename) as bz2f:
self.assertRaises(TypeError, bz2f.readlines, None) self.assertRaises(TypeError, bz2f.readlines, None)
sio = BytesIO(self.TEXT) self.assertEqual(bz2f.readlines(), self.TEXT_LINES)
self.assertEqual(bz2f.readlines(), sio.readlines())
def testReadLinesMultiStream(self): def testReadLinesMultiStream(self):
self.createTempFile(streams=5) self.createTempFile(streams=5)
with BZ2File(self.filename) as bz2f: with BZ2File(self.filename) as bz2f:
self.assertRaises(TypeError, bz2f.readlines, None) self.assertRaises(TypeError, bz2f.readlines, None)
sio = BytesIO(self.TEXT * 5) self.assertEqual(bz2f.readlines(), self.TEXT_LINES * 5)
self.assertEqual(bz2f.readlines(), sio.readlines())
def testIterator(self): def testIterator(self):
self.createTempFile() self.createTempFile()
with BZ2File(self.filename) as bz2f: with BZ2File(self.filename) as bz2f:
sio = BytesIO(self.TEXT) self.assertEqual(list(iter(bz2f)), self.TEXT_LINES)
self.assertEqual(list(iter(bz2f)), sio.readlines())
def testIteratorMultiStream(self): def testIteratorMultiStream(self):
self.createTempFile(streams=5) self.createTempFile(streams=5)
with BZ2File(self.filename) as bz2f: with BZ2File(self.filename) as bz2f:
sio = BytesIO(self.TEXT * 5) self.assertEqual(list(iter(bz2f)), self.TEXT_LINES * 5)
self.assertEqual(list(iter(bz2f)), sio.readlines())
def testClosedIteratorDeadlock(self): def testClosedIteratorDeadlock(self):
# Issue #3309: Iteration on a closed BZ2File should release the lock. # Issue #3309: Iteration on a closed BZ2File should release the lock.
@ -233,8 +227,7 @@ class BZ2FileTest(BaseTest):
def testWriteLines(self): def testWriteLines(self):
with BZ2File(self.filename, "w") as bz2f: with BZ2File(self.filename, "w") as bz2f:
self.assertRaises(TypeError, bz2f.writelines) self.assertRaises(TypeError, bz2f.writelines)
sio = BytesIO(self.TEXT) bz2f.writelines(self.TEXT_LINES)
bz2f.writelines(sio.readlines())
# Issue #1535500: Calling writelines() on a closed BZ2File # Issue #1535500: Calling writelines() on a closed BZ2File
# should raise an exception. # should raise an exception.
self.assertRaises(ValueError, bz2f.writelines, ["a"]) self.assertRaises(ValueError, bz2f.writelines, ["a"])