Issue #20557: Use specific asserts in io tests.
diff --git a/Lib/test/test_bufio.py b/Lib/test/test_bufio.py
index 108b1e1..d6b12e3 100644
--- a/Lib/test/test_bufio.py
+++ b/Lib/test/test_bufio.py
@@ -34,7 +34,7 @@
line = f.readline()
self.assertEqual(line, s)
line = f.readline()
- self.assertTrue(not line) # Must be at EOF
+ self.assertFalse(line) # Must be at EOF
f.close()
finally:
support.unlink(support.TESTFN)
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index 4f2c9ef..1fd7910 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -88,8 +88,8 @@
def testErrors(self):
f = self.f
self.assertEqual(f.name, TESTFN)
- self.assertTrue(not f.isatty())
- self.assertTrue(not f.closed)
+ self.assertFalse(f.isatty())
+ self.assertFalse(f.closed)
if hasattr(f, "readinto"):
self.assertRaises((IOError, TypeError), f.readinto, "")
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index e21e47f..8fdad14 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -112,15 +112,15 @@
def testErrors(self):
f = self.f
- self.assertTrue(not f.isatty())
- self.assertTrue(not f.closed)
+ self.assertFalse(f.isatty())
+ self.assertFalse(f.closed)
#self.assertEqual(f.name, TESTFN)
self.assertRaises(ValueError, f.read, 10) # Open for reading
f.close()
self.assertTrue(f.closed)
f = _FileIO(TESTFN, 'r')
self.assertRaises(TypeError, f.readinto, "")
- self.assertTrue(not f.closed)
+ self.assertFalse(f.closed)
f.close()
self.assertTrue(f.closed)
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 1a17d81..252d5d8 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -426,7 +426,7 @@
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 = []
@@ -544,7 +544,7 @@
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")
@@ -668,7 +668,7 @@
del MyIO
del obj
support.gc_collect()
- self.assertTrue(wr() is None, wr)
+ self.assertIsNone(wr(), wr)
class PyIOTest(IOTest):
test_array_writes = unittest.skip(
@@ -1062,7 +1062,7 @@
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
@@ -1365,7 +1365,7 @@
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")
@@ -2063,7 +2063,7 @@
t = self.TextIOWrapper(b, encoding="utf8")
self.assertEqual(t.encoding, "utf8")
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):
@@ -2687,7 +2687,7 @@
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")
@@ -2837,7 +2837,7 @@
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":
@@ -2932,7 +2932,7 @@
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.
@@ -3025,7 +3025,7 @@
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)
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
index fdd642b..0eb9961 100644
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -673,7 +673,8 @@
self.assertEqual(len(state), 3)
bytearray(state[0]) # Check if state[0] supports the buffer interface.
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()
self.assertRaises(ValueError, memio.__getstate__)
@@ -729,7 +730,8 @@
self.assertIsInstance(state[0], unicode)
self.assertIsInstance(state[1], str)
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()
self.assertRaises(ValueError, memio.__getstate__)