Skip to content

C
cpython
Kaydet (Commit) 72e58651 authored tarafından Nadeem Vawda's avatar Nadeem Vawda
Dosyalara gözat
Seçenekler

Simplify line-oriented tests in test_bz2.

üst f3ecb838
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 14 deletions
Lib/test/test_bz2.py
Dosyayı görüntüle @ 72e58651
...@@ -163,43 +163,37 @@ class BZ2FileTest(BaseTest): ...@@ -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): ...@@ -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"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment