changeset:   97202:859a45ca1e86
parent:      97199:a0ac94514a30
parent:      97201:2453ac990e5b
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sun Aug 02 15:18:53 2015 +0300
files:       Lib/test/test_file.py
description:
Issue #20557: Use specific asserts in io tests.


diff -r a0ac94514a30 -r 859a45ca1e86 Lib/test/test_bufio.py
--- a/Lib/test/test_bufio.py	Sat Aug 01 22:00:17 2015 -0500
+++ b/Lib/test/test_bufio.py	Sun Aug 02 15:18:53 2015 +0300
@@ -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 -r a0ac94514a30 -r 859a45ca1e86 Lib/test/test_file.py
--- a/Lib/test/test_file.py	Sat Aug 01 22:00:17 2015 -0500
+++ b/Lib/test/test_file.py	Sun Aug 02 15:18:53 2015 +0300
@@ -83,8 +83,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((OSError, TypeError), f.readinto, "")
diff -r a0ac94514a30 -r 859a45ca1e86 Lib/test/test_fileio.py
--- a/Lib/test/test_fileio.py	Sat Aug 01 22:00:17 2015 -0500
+++ b/Lib/test/test_fileio.py	Sun Aug 02 15:18:53 2015 +0300
@@ -177,15 +177,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 = self.FileIO(TESTFN, 'r')
         self.assertRaises(TypeError, f.readinto, "")
-        self.assertTrue(not f.closed)
+        self.assertFalse(f.closed)
         f.close()
         self.assertTrue(f.closed)
 
diff -r a0ac94514a30 -r 859a45ca1e86 Lib/test/test_io.py
--- a/Lib/test/test_io.py	Sat Aug 01 22:00:17 2015 -0500
+++ b/Lib/test/test_io.py	Sun Aug 02 15:18:53 2015 +0300
@@ -449,7 +449,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 = []
@@ -569,7 +569,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")
 
@@ -713,7 +713,7 @@
         del MyIO
         del obj
         support.gc_collect()
-        self.assertTrue(wr() is None, wr)
+        self.assertIsNone(wr(), wr)
 
 class PyIOTest(IOTest):
     pass
@@ -1240,7 +1240,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
@@ -1543,7 +1543,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")
 
@@ -2275,7 +2275,7 @@
         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):
@@ -3062,7 +3062,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")
 
@@ -3210,7 +3210,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":
@@ -3302,7 +3302,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.
@@ -3448,7 +3448,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 -r a0ac94514a30 -r 859a45ca1e86 Lib/test/test_memoryio.py
--- a/Lib/test/test_memoryio.py	Sat Aug 01 22:00:17 2015 -0500
+++ b/Lib/test/test_memoryio.py	Sun Aug 02 15:18:53 2015 +0300
@@ -694,7 +694,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__)
 
@@ -794,7 +795,8 @@
         self.assertIsInstance(state[0], str)
         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__)