Merge pull request #1111 from nedbat/nedbat/unittest2pytest

Use unittest2pytest to convert assertions

1 files changed, 11 insertions, 19 deletions

diff --git a/tests/test_arcs.py b/tests/test_arcs.py
index f3aa8ebb..3b63bcc2 100644
--- a/tests/test_arcs.py
+++ b/tests/test_arcs.py
@@ -94,7 +94,7 @@ class SimpleArcTest(CoverageTest):
                 if x % 2: return True
                 return False
             a = fn(1)
-            assert a == True
+            assert a is True
             """,
             arcz=".1 14 45 5.  .2 2. 23 3.", arcz_missing="23 3.")
 
@@ -270,13 +270,10 @@ class LoopArcTest(CoverageTest):
         # With "while 1", the loop knows it's constant.
         if env.PYBEHAVIOR.keep_constant_test:
             arcz = ".1 12 23 34 45 36 62 57 7."
-            arcz_missing = ""
         elif env.PYBEHAVIOR.nix_while_true:
             arcz = ".1 13 34 45 36 63 57 7."
-            arcz_missing = ""
         else:
             arcz = ".1 12 23 34 45 36 63 57 7."
-            arcz_missing = ""
         self.check_coverage("""\
             a, i = 1, 0
             while 1:
@@ -287,7 +284,6 @@ class LoopArcTest(CoverageTest):
             assert a == 4 and i == 3
             """,
             arcz=arcz,
-            arcz_missing=arcz_missing,
             )
 
     def test_while_true(self):
@@ -322,7 +318,7 @@ class LoopArcTest(CoverageTest):
                     return 1
             """)
         out = self.run_command("coverage run --branch --source=. main.py")
-        self.assertEqual(out, 'done\n')
+        assert out == 'done\n'
         if env.PYBEHAVIOR.keep_constant_test:
             num_stmts = 3
         elif env.PYBEHAVIOR.nix_while_true:
@@ -332,7 +328,7 @@ class LoopArcTest(CoverageTest):
         expected = "zero.py {n} {n} 0 0 0% 1-3".format(n=num_stmts)
         report = self.report_from_command("coverage report -m")
         squeezed = self.squeezed_lines(report)
-        self.assertIn(expected, squeezed[3])
+        assert expected in squeezed[3]
 
     def test_bug_496_continue_in_constant_while(self):
         # https://github.com/nedbat/coveragepy/issues/496
@@ -1086,7 +1082,7 @@ class YieldTest(CoverageTest):
                 ".2 23 34 45 52 2.",
             arcz_missing="2.",
         )
-        self.assertEqual(self.stdout(), "20\n12\n")
+        assert self.stdout() == "20\n12\n"
 
     def test_yield_from(self):
         if not env.PYBEHAVIOR.yield_from:
@@ -1387,7 +1383,7 @@ class MiscArcTest(CoverageTest):
                 print(len(data))
                 """
             self.check_coverage(code, arcs=[(-1, 1), (1, 2*n+4), (2*n+4, -1)])
-            self.assertEqual(self.stdout().split()[-1], str(n))
+            assert self.stdout().split()[-1] == str(n)
 
     def test_partial_generators(self):
         # https://github.com/nedbat/coveragepy/issues/475
@@ -1410,14 +1406,10 @@ class MiscArcTest(CoverageTest):
         filename = self.last_module_name + ".py"
         fr = cov._get_file_reporter(filename)
         arcs_executed = cov._analyze(filename).arcs_executed()
-        self.assertEqual(
-            fr.missing_arc_description(3, -3, arcs_executed),
-            "line 3 didn't finish the generator expression on line 3"
-        )
-        self.assertEqual(
-            fr.missing_arc_description(4, -4, arcs_executed),
-            "line 4 didn't run the generator expression on line 4"
-        )
+        expected = "line 3 didn't finish the generator expression on line 3"
+        assert expected == fr.missing_arc_description(3, -3, arcs_executed)
+        expected = "line 4 didn't run the generator expression on line 4"
+        assert expected == fr.missing_arc_description(4, -4, arcs_executed)
 
 
 class DecoratorArcTest(CoverageTest):
@@ -1620,7 +1612,7 @@ class AsyncTest(CoverageTest):
                 "-89 9C C-8",
             arcz_unpredicted="5-3 9-8",
         )
-        self.assertEqual(self.stdout(), "Compute 1 + 2 ...\n1 + 2 = 3\n")
+        assert self.stdout() == "Compute 1 + 2 ...\n1 + 2 = 3\n"
 
     def test_async_for(self):
         self.check_coverage("""\
@@ -1657,7 +1649,7 @@ class AsyncTest(CoverageTest):
                 "-AB BC C-A DE E-A ",       # __anext__
             arcz_unpredicted="CD",
         )
-        self.assertEqual(self.stdout(), "a\nb\nc\n.\n")
+        assert self.stdout() == "a\nb\nc\n.\n"
 
     def test_async_with(self):
         self.check_coverage("""\