Issue #20557: Use specific asserts in io tests.

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

View file

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