[Python-checkins] cpython (3.4): Issue #20557: Use specific asserts in io tests.

Sun Aug 2 14:21:20 CEST 2015

https://hg.python.org/cpython/rev/ace74c445a3f
changeset: 97200:ace74c445a3f
branch: 3.4
parent: 97197:c981d9819384
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Aug 02 15:17:49 2015 +0300
summary:
 Issue #20557: Use specific asserts in io tests.
files:
 Lib/test/test_bufio.py | 2 +-
 Lib/test/test_file.py | 4 ++--
 Lib/test/test_fileio.py | 6 +++---
 Lib/test/test_io.py | 20 ++++++++++----------
 Lib/test/test_memoryio.py | 6 ++++--
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Lib/test/test_bufio.py b/Lib/test/test_bufio.py
--- 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
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -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 --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -113,15 +113,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
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -453,7 +453,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 = []
@@ -573,7 +573,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")
 
@@ -717,7 +717,7 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -693,7 +693,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__)
 
@@ -749,7 +750,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__)
 
-- 
Repository URL: https://hg.python.org/cpython
