diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2023-05-11 07:24:02 -0400 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2023-05-11 07:57:45 -0400 |
commit | 11dcf13f48a3fd6cb21ad2e96998061d127ac2ff (patch) | |
tree | 3884434db48f841345ca0f7e38e7286f2bcf03fd /tests | |
parent | 2b84823331e5db2f89d5b8ab6ac00a4447c34cf6 (diff) | |
download | python-coveragepy-git-11dcf13f48a3fd6cb21ad2e96998061d127ac2ff.tar.gz |
fix: Python3.12 now inlines comprehensions
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_arcs.py | 24 | ||||
-rw-r--r-- | tests/test_parser.py | 9 |
2 files changed, 23 insertions, 10 deletions
diff --git a/tests/test_arcs.py b/tests/test_arcs.py index d80a4637..d4c1ba9d 100644 --- a/tests/test_arcs.py +++ b/tests/test_arcs.py @@ -559,6 +559,10 @@ class LoopArcTest(CoverageTest): ) def test_confusing_for_loop_bug_175(self) -> None: + if env.PYBEHAVIOR.comprehensions_are_functions: + extra_arcz = " -22 2-2" + else: + extra_arcz = "" self.check_coverage("""\ o = [(1,2), (3,4)] o = [a for a in o] @@ -566,7 +570,7 @@ class LoopArcTest(CoverageTest): x = tup[0] y = tup[1] """, - arcz=".1 -22 2-2 12 23 34 45 53 3.", + arcz=".1 12 23 34 45 53 3." + extra_arcz, ) self.check_coverage("""\ o = [(1,2), (3,4)] @@ -574,7 +578,7 @@ class LoopArcTest(CoverageTest): x = tup[0] y = tup[1] """, - arcz=".1 12 -22 2-2 23 34 42 2.", + arcz=".1 12 23 34 42 2." + extra_arcz, ) # https://bugs.python.org/issue44672 @@ -639,6 +643,10 @@ class LoopArcTest(CoverageTest): ) def test_other_comprehensions(self) -> None: + if env.PYBEHAVIOR.comprehensions_are_functions: + extra_arcz = " -22 2-2" + else: + extra_arcz = "" # Set comprehension: self.check_coverage("""\ o = ((1,2), (3,4)) @@ -647,7 +655,7 @@ class LoopArcTest(CoverageTest): x = tup[0] y = tup[1] """, - arcz=".1 -22 2-2 12 23 34 45 53 3.", + arcz=".1 12 23 34 45 53 3." + extra_arcz, ) # Dict comprehension: self.check_coverage("""\ @@ -657,10 +665,14 @@ class LoopArcTest(CoverageTest): x = tup[0] y = tup[1] """, - arcz=".1 -22 2-2 12 23 34 45 53 3.", + arcz=".1 12 23 34 45 53 3." + extra_arcz, ) def test_multiline_dict_comp(self) -> None: + if env.PYBEHAVIOR.comprehensions_are_functions: + extra_arcz = " 2-2" + else: + extra_arcz = "" # Multiline dict comp: self.check_coverage("""\ # comment @@ -675,7 +687,7 @@ class LoopArcTest(CoverageTest): } x = 11 """, - arcz="-22 2B B-2 2-2" + arcz="-22 2B B-2" + extra_arcz, ) # Multi dict comp: self.check_coverage("""\ @@ -695,7 +707,7 @@ class LoopArcTest(CoverageTest): } x = 15 """, - arcz="-22 2F F-2 2-2" + arcz="-22 2F F-2" + extra_arcz, ) diff --git a/tests/test_parser.py b/tests/test_parser.py index f74420b5..d461cb6c 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -322,10 +322,11 @@ class ParserMissingArcDescriptionTest(CoverageTest): assert expected == parser.missing_arc_description(2, -2) expected = "line 3 didn't finish the generator expression on line 3" assert expected == parser.missing_arc_description(3, -3) - expected = "line 4 didn't finish the dictionary comprehension on line 4" - assert expected == parser.missing_arc_description(4, -4) - expected = "line 5 didn't finish the set comprehension on line 5" - assert expected == parser.missing_arc_description(5, -5) + if env.PYBEHAVIOR.comprehensions_are_functions: + expected = "line 4 didn't finish the dictionary comprehension on line 4" + assert expected == parser.missing_arc_description(4, -4) + expected = "line 5 didn't finish the set comprehension on line 5" + assert expected == parser.missing_arc_description(5, -5) def test_missing_arc_descriptions_for_exceptions(self) -> None: parser = self.parse_text("""\ |