From 789f95ac9784036741fb04257bdc52e96e80685a Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Mon, 9 Jul 2018 20:00:53 +0300 Subject: [2.7] Fixed several assertTrue() that were intended to be assertEqual(). (GH-8191) (GH-8202) 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_test_support.py | 2 +- Lib/test/test_warnings.py | 12 ++++++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py index f2fe10a..de730e9 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(u"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 5f1659b..ff05dce 100644 --- a/Lib/test/test_pkg.py +++ b/Lib/test/test_pkg.py @@ -134,7 +134,7 @@ class Test(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_test_support.py b/Lib/test/test_test_support.py index 60476b7..f9192a7 100644 --- a/Lib/test/test_test_support.py +++ b/Lib/test/test_test_support.py @@ -267,7 +267,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_warnings.py b/Lib/test/test_warnings.py index ae081ee..a9568f6 100644 --- a/Lib/test/test_warnings.py +++ b/Lib/test/test_warnings.py @@ -107,10 +107,14 @@ class FilterTests(object): 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_default(self): with original_warnings.catch_warnings(record=True, -- cgit v0.12