Use more specific test methods

Author: hugovk

Lib/test/test_unittest/test_case.py

@@ -677,7 +677,7 @@ def testAddTypeEqualityFunc(self):
         class SadSnake:
             """Dummy class for test_addTypeEqualityFunc."""
         s1, s2 = SadSnake(), SadSnake()
-        self.assertFalse(s1 == s2)
+        self.assertNotEqual(s1, s2)
         def AllSnakesCreatedEqual(a, b, msg=None):
             return type(a) == type(b) == SadSnake
         self.addTypeEqualityFunc(SadSnake, AllSnakesCreatedEqual)

Lib/test/test_unittest/test_discovery.py

@@ -516,9 +516,11 @@ def test_discover_with_modules_that_fail_to_import(self):
         self.assertNotEqual([], loader.errors)
         self.assertEqual(1, len(loader.errors))
         error = loader.errors[0]
-        self.assertTrue(
-            'Failed to import test module: test_this_does_not_exist' in error,
-            'missing error string in %r' % error)
+        self.assertIn(
+            'Failed to import test module: test_this_does_not_exist',
+            error,
+            'missing error string in %r' % error
+        )
         test = list(list(suite)[0])[0] # extract test from suite
 
         with self.assertRaises(ImportError):
@@ -542,9 +544,11 @@ def _get_module_from_name(name):
         self.assertNotEqual([], loader.errors)
         self.assertEqual(1, len(loader.errors))
         error = loader.errors[0]
-        self.assertTrue(
-            'Failed to import test module: my_package' in error,
-            'missing error string in %r' % error)
+        self.assertIn(
+            'Failed to import test module: my_package',
+            error,
+            'missing error string in %r' % error
+        )
         test = list(list(suite)[0])[0] # extract test from suite
         with self.assertRaises(ImportError):
             test.my_package()
@@ -624,9 +628,9 @@ def test_command_line_handling_discover_by_default(self):
         program.parseArgs(['something'])
         self.assertEqual(args, [[]])
         self.assertEqual(program.verbosity, 1)
-        self.assertIs(program.buffer, False)
-        self.assertIs(program.catchbreak, False)
-        self.assertIs(program.failfast, False)
+        self.assertFalse(program.buffer)
+        self.assertFalse(program.catchbreak)
+        self.assertFalse(program.failfast)
 
     def test_command_line_handling_discover_by_default_with_options(self):
         program = TestableTestProgram()
@@ -636,9 +640,9 @@ def test_command_line_handling_discover_by_default_with_options(self):
         program.parseArgs(['something', '-v', '-b', '-v', '-c', '-f'])
         self.assertEqual(args, [[]])
         self.assertEqual(program.verbosity, 2)
-        self.assertIs(program.buffer, True)
-        self.assertIs(program.catchbreak, True)
-        self.assertIs(program.failfast, True)
+        self.assertTrue(program.buffer)
+        self.assertTrue(program.catchbreak)
+        self.assertTrue(program.failfast)
 
 
     def test_command_line_handling_do_discovery_too_many_arguments(self):

Lib/test/test_unittest/test_loader.py

@@ -245,9 +245,11 @@ def load_tests(loader, tests, pattern):
         self.assertNotEqual([], loader.errors)
         self.assertEqual(1, len(loader.errors))
         error = loader.errors[0]
-        self.assertTrue(
-            'Failed to call load_tests:' in error,
-            'missing error string in %r' % error)
+        self.assertIn(
+            'Failed to call load_tests:',
+            error,
+            'missing error string in %r' % error
+        )
         test = list(suite)[0]
 
         self.assertRaisesRegex(TypeError, "some failure", test.m)

Lib/test/test_unittest/test_program.py

@@ -259,7 +259,7 @@ def testBufferCatchFailfast(self):
 
             setattr(program, attr, None)
             program.parseArgs([None])
-            self.assertIs(getattr(program, attr), False)
+            self.assertFalse(getattr(program, attr))
 
             false = []
             setattr(program, attr, false)
@@ -276,7 +276,7 @@ def testBufferCatchFailfast(self):
             for opt in short_opt, long_opt:
                 setattr(program, attr, None)
                 program.parseArgs([None, opt])
-                self.assertIs(getattr(program, attr), True)
+                self.assertTrue(getattr(program, attr))
 
                 setattr(program, attr, False)
                 with support.captured_stderr() as stderr, \

Lib/test/test_unittest/test_runner.py

@@ -1392,15 +1392,15 @@ def testStdErrLookedUpAtInstantiationTime(self):
         sys.stderr = f
         try:
             runner = unittest.TextTestRunner()
-            self.assertTrue(runner.stream.stream is f)
+            self.assertIs(runner.stream.stream, f)
         finally:
             sys.stderr = old_stderr
 
     def testSpecifiedStreamUsed(self):
         # see issue 10786
         f = io.StringIO()
         runner = unittest.TextTestRunner(f)
-        self.assertTrue(runner.stream.stream is f)
+        self.assertIs(runner.stream.stream, f)
 
     def test_durations(self):
         def run(test, *, expect_durations=True):