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

Issue #20557: Use specific asserts in io tests.

Browse source
This commit is contained in:
Serhiy Storchaka 2015-08-02 15:17:49 +03:00
parent ce17f76475
commit 0dcd80a6c0
5 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_bufio.py
View file

@ -34,7 +34,7 @@ class BufferSizeTest:
line = f.readline() line = f.readline()
self.assertEqual(line, s) self.assertEqual(line, s)
line = f.readline() line = f.readline()
self.assertTrue(not line) # Must be at EOF self.assertFalse(line) # Must be at EOF
f.close() f.close()
finally: finally:
support.unlink(support.TESTFN) support.unlink(support.TESTFN)

4
Lib/test/test_file.py
View file

@ -83,8 +83,8 @@ class AutoFileTests:
def testErrors(self): def testErrors(self):
f = self.f f = self.f
self.assertEqual(f.name, TESTFN) self.assertEqual(f.name, TESTFN)
self.assertTrue(not f.isatty()) self.assertFalse(f.isatty())
self.assertTrue(not f.closed) self.assertFalse(f.closed)
if hasattr(f, "readinto"): if hasattr(f, "readinto"):
self.assertRaises((OSError, TypeError), f.readinto, "") self.assertRaises((OSError, TypeError), f.readinto, "")

6
Lib/test/test_fileio.py
View file

@ -113,15 +113,15 @@ class AutoFileTests(unittest.TestCase):
def testErrors(self): def testErrors(self):
f = self.f f = self.f
self.assertTrue(not f.isatty()) self.assertFalse(f.isatty())
self.assertTrue(not f.closed) self.assertFalse(f.closed)
#self.assertEqual(f.name, TESTFN) #self.assertEqual(f.name, TESTFN)
self.assertRaises(ValueError, f.read, 10) # Open for reading self.assertRaises(ValueError, f.read, 10) # Open for reading
f.close() f.close()
self.assertTrue(f.closed) self.assertTrue(f.closed)
f = _FileIO(TESTFN, 'r') f = _FileIO(TESTFN, 'r')
self.assertRaises(TypeError, f.readinto, "") self.assertRaises(TypeError, f.readinto, "")
self.assertTrue(not f.closed) self.assertFalse(f.closed)
f.close() f.close()
self.assertTrue(f.closed) self.assertTrue(f.closed)

20
Lib/test/test_io.py
View file

@ -453,7 +453,7 @@ class IOTest(unittest.TestCase):
with self.open(support.TESTFN, "ab") as f: with self.open(support.TESTFN, "ab") as f:
self.assertEqual(f.tell(), 3) self.assertEqual(f.tell(), 3)
with self.open(support.TESTFN, "a") as f: with self.open(support.TESTFN, "a") as f:
self.assertTrue(f.tell() > 0) self.assertGreater(f.tell(), 0)
def test_destructor(self): def test_destructor(self):
record = [] record = []
@ -573,7 +573,7 @@ class IOTest(unittest.TestCase):
wr = weakref.ref(f) wr = weakref.ref(f)
del f del f
support.gc_collect() support.gc_collect()
self.assertTrue(wr() is None, wr) self.assertIsNone(wr(), wr)
with self.open(support.TESTFN, "rb") as f: with self.open(support.TESTFN, "rb") as f:
self.assertEqual(f.read(), b"abcxxx") self.assertEqual(f.read(), b"abcxxx")
@ -717,7 +717,7 @@ class CIOTest(IOTest):
del MyIO del MyIO
del obj del obj
support.gc_collect() support.gc_collect()
self.assertTrue(wr() is None, wr) self.assertIsNone(wr(), wr)
class PyIOTest(IOTest): class PyIOTest(IOTest):
pass pass
@ -1164,7 +1164,7 @@ class CBufferedReaderTest(BufferedReaderTest, SizeofTest):
wr = weakref.ref(f) wr = weakref.ref(f)
del f del f
support.gc_collect() support.gc_collect()
self.assertTrue(wr() is None, wr) self.assertIsNone(wr(), wr)
def test_args_error(self): def test_args_error(self):
# Issue #17275 # Issue #17275
@ -1467,7 +1467,7 @@ class CBufferedWriterTest(BufferedWriterTest, SizeofTest):
wr = weakref.ref(f) wr = weakref.ref(f)
del f del f
support.gc_collect() support.gc_collect()
self.assertTrue(wr() is None, wr) self.assertIsNone(wr(), wr)
with self.open(support.TESTFN, "rb") as f: with self.open(support.TESTFN, "rb") as f:
self.assertEqual(f.read(), b"123xxx") self.assertEqual(f.read(), b"123xxx")
@ -2199,7 +2199,7 @@ class TextIOWrapperTest(unittest.TestCase):
t = self.TextIOWrapper(b, encoding="utf-8") t = self.TextIOWrapper(b, encoding="utf-8")
self.assertEqual(t.encoding, "utf-8") self.assertEqual(t.encoding, "utf-8")
t = self.TextIOWrapper(b) t = self.TextIOWrapper(b)
self.assertTrue(t.encoding is not None) self.assertIsNotNone(t.encoding)
codecs.lookup(t.encoding) codecs.lookup(t.encoding)
def test_encoding_errors_reading(self): def test_encoding_errors_reading(self):
@ -2958,7 +2958,7 @@ class CTextIOWrapperTest(TextIOWrapperTest):
wr = weakref.ref(t) wr = weakref.ref(t)
del t del t
support.gc_collect() support.gc_collect()
self.assertTrue(wr() is None, wr) self.assertIsNone(wr(), wr)
with self.open(support.TESTFN, "rb") as f: with self.open(support.TESTFN, "rb") as f:
self.assertEqual(f.read(), b"456def") self.assertEqual(f.read(), b"456def")
@ -3106,7 +3106,7 @@ class MiscIOTest(unittest.TestCase):
def test___all__(self): def test___all__(self):
for name in self.io.__all__: for name in self.io.__all__:
obj = getattr(self.io, name, None) obj = getattr(self.io, name, None)
self.assertTrue(obj is not None, name) self.assertIsNotNone(obj, name)
if name == "open": if name == "open":
continue continue
elif "error" in name.lower() or name == "UnsupportedOperation": elif "error" in name.lower() or name == "UnsupportedOperation":
@ -3196,7 +3196,7 @@ class MiscIOTest(unittest.TestCase):
wr = weakref.ref(c) wr = weakref.ref(c)
del c, b del c, b
support.gc_collect() support.gc_collect()
self.assertTrue(wr() is None, wr) self.assertIsNone(wr(), wr)
def test_abcs(self): def test_abcs(self):
# Test the visible base classes are ABCs. # Test the visible base classes are ABCs.
@ -3348,7 +3348,7 @@ class MiscIOTest(unittest.TestCase):
received += iter(rf.read, None) received += iter(rf.read, None)
sent, received = b''.join(sent), b''.join(received) sent, received = b''.join(sent), b''.join(received)
self.assertTrue(sent == received) self.assertEqual(sent, received)
self.assertTrue(wf.closed) self.assertTrue(wf.closed)
self.assertTrue(rf.closed) self.assertTrue(rf.closed)

6
Lib/test/test_memoryio.py
View file

@ -693,7 +693,8 @@ class CBytesIOTest(PyBytesIOTest):
self.assertEqual(len(state), 3) self.assertEqual(len(state), 3)
bytearray(state[0]) # Check if state[0] supports the buffer interface. bytearray(state[0]) # Check if state[0] supports the buffer interface.
self.assertIsInstance(state[1], int) self.assertIsInstance(state[1], int)
self.assertTrue(isinstance(state[2], dict) or state[2] is None) if state[2] is not None:
self.assertIsInstance(state[2], dict)
memio.close() memio.close()
self.assertRaises(ValueError, memio.__getstate__) self.assertRaises(ValueError, memio.__getstate__)
@ -749,7 +750,8 @@ class CStringIOTest(PyStringIOTest):
self.assertIsInstance(state[0], str) self.assertIsInstance(state[0], str)
self.assertIsInstance(state[1], str) self.assertIsInstance(state[1], str)
self.assertIsInstance(state[2], int) self.assertIsInstance(state[2], int)
self.assertTrue(isinstance(state[3], dict) or state[3] is None) if state[3] is not None:
self.assertIsInstance(state[3], dict)
memio.close() memio.close()
self.assertRaises(ValueError, memio.__getstate__) self.assertRaises(ValueError, memio.__getstate__)