From 13d1025e43068ba9f9da32b2e19f53bba9d91806 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 9 Jul 2018 08:54:27 -0700 Subject: [PATCH] Fixed several assertTrue() that were intended to be assertEqual(). (GH-8191) Fixed also testing the "always" warning filter. (cherry picked from commit b796e7dcdc24ff7ec53044af041254c83a8ace21) Co-authored-by: Sergey Fedoseev --- Lib/ctypes/test/test_as_parameter.py | 2 +- Lib/test/test_pkg.py | 2 +- Lib/test/test_socket.py | 2 +- Lib/test/test_support.py | 2 +- Lib/test/test_tokenize.py | 2 +- Lib/test/test_warnings/__init__.py | 12 ++++++++---- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py index a2640575a0..f9d27cb89d 100644 --- a/Lib/ctypes/test/test_as_parameter.py +++ b/Lib/ctypes/test/test_as_parameter.py @@ -24,7 +24,7 @@ class BasicWrapTestCase(unittest.TestCase): f.argtypes = [c_byte, c_wchar, c_int, c_long, c_float, c_double] result = f(self.wrap(1), self.wrap("x"), self.wrap(3), self.wrap(4), self.wrap(5.0), self.wrap(6.0)) self.assertEqual(result, 139) - self.assertTrue(type(result), int) + self.assertIs(type(result), int) def test_pointers(self): f = dll._testfunc_p_p diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py index 532e8fe6d0..8130eab50a 100644 --- a/Lib/test/test_pkg.py +++ b/Lib/test/test_pkg.py @@ -138,7 +138,7 @@ class TestPkg(unittest.TestCase): s = """ from t2 import * - self.assertTrue(dir(), ['self', 'sub']) + self.assertEqual(dir(), ['self', 'sub']) """ self.run_code(s) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index e41ddfd8af..77357868d9 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -5490,7 +5490,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): op=socket.ALG_OP_ENCRYPT, iv=iv) enc = op.recv(msglen * multiplier) self.assertEqual(len(enc), msglen * multiplier) - self.assertTrue(enc[:msglen], ciphertext) + self.assertEqual(enc[:msglen], ciphertext) op, _ = algo.accept() with op: diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 6e0c122c4f..45cdc94393 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -247,7 +247,7 @@ class TestSupport(unittest.TestCase): with support.temp_cwd(name=TESTFN): self.assertEqual(os.path.basename(os.getcwd()), TESTFN) self.assertFalse(os.path.exists(TESTFN)) - self.assertTrue(os.path.basename(os.getcwd()), here) + self.assertEqual(os.getcwd(), here) def test_temp_cwd__name_none(self): diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py index ac65bd0964..844358aeef 100644 --- a/Lib/test/test_tokenize.py +++ b/Lib/test/test_tokenize.py @@ -1336,7 +1336,7 @@ class TestTokenize(TestCase): tokenize_module.detect_encoding = orig_detect_encoding tokenize_module._tokenize = orig__tokenize - self.assertTrue(encoding_used, encoding) + self.assertEqual(encoding_used, encoding) def test_oneline_defs(self): buf = [] diff --git a/Lib/test/test_warnings/__init__.py b/Lib/test/test_warnings/__init__.py index ea81d11916..3dc88f5e36 100644 --- a/Lib/test/test_warnings/__init__.py +++ b/Lib/test/test_warnings/__init__.py @@ -145,10 +145,14 @@ class FilterTests(BaseTest): self.module.resetwarnings() self.module.filterwarnings("always", category=UserWarning) message = "FilterTests.test_always" - self.module.warn(message, UserWarning) - self.assertTrue(message, w[-1].message) - self.module.warn(message, UserWarning) - self.assertTrue(w[-1].message, message) + def f(): + self.module.warn(message, UserWarning) + f() + self.assertEqual(len(w), 1) + self.assertEqual(w[-1].message.args[0], message) + f() + self.assertEqual(len(w), 2) + self.assertEqual(w[-1].message.args[0], message) def test_always_after_default(self): with original_warnings.catch_warnings(record=True, -- 2.50.0