[Python-checkins] cpython: Issue #29200: Fix test to use self.assertEqual instead of py.test style tests

[raymond.hettinger]

https://hg.python.org/cpython/rev/2e7e91785306
changeset:   106039:2e7e91785306
user:        Raymond Hettinger <python at rcn.com>
date:        Sat Jan 07 20:53:09 2017 -0800
summary:
  Issue #29200: Fix test to use self.assertEqual instead of py.test style tests

files:
  Lib/test/test_functools.py |  24 ++++++++++++------------
  1 files changed, 12 insertions(+), 12 deletions(-)


diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1207,24 +1207,24 @@
         mock_int.__hash__ = unittest.mock.Mock(return_value=999)
 
         # Add to cache:  One use as an argument gives one call
-        assert f(mock_int, 1) == 16
-        assert mock_int.__hash__.call_count == 1
-        assert f.cache_info() == (0, 1, 1, 1)
+        self.assertEqual(f(mock_int, 1), 16)
+        self.assertEqual(mock_int.__hash__.call_count, 1)
+        self.assertEqual(f.cache_info(), (0, 1, 1, 1))
 
         # Cache hit: One use as an argument gives one additional call
-        assert f(mock_int, 1) == 16
-        assert mock_int.__hash__.call_count == 2
-        assert f.cache_info() == (1, 1, 1, 1)
+        self.assertEqual(f(mock_int, 1), 16)
+        self.assertEqual(mock_int.__hash__.call_count, 2)
+        self.assertEqual(f.cache_info(), (1, 1, 1, 1))
 
         # Cache eviction: No use as an argument gives no additonal call
-        assert f(6, 2) == 20
-        assert mock_int.__hash__.call_count == 2
-        assert f.cache_info() == (1, 2, 1, 1)
+        self.assertEqual(f(6, 2), 20)
+        self.assertEqual(mock_int.__hash__.call_count, 2)
+        self.assertEqual(f.cache_info(), (1, 2, 1, 1))
 
         # Cache miss: One use as an argument gives one additional call
-        assert f(mock_int, 1) == 16
-        assert mock_int.__hash__.call_count == 3
-        assert f.cache_info() == (1, 3, 1, 1)
+        self.assertEqual(f(mock_int, 1), 16)
+        self.assertEqual(mock_int.__hash__.call_count, 3)
+        self.assertEqual(f.cache_info(), (1, 3, 1, 1))
 
     def test_lru_reentrancy_with_len(self):
         # Test to make sure the LRU cache code isn't thrown-off by

-- 
Repository URL: https://hg.python.org/cpython