test: xfail decorator tests that fail on PyPy 3.8 (7.3.10alpha)

https://foss.heptapod.net/pypy/pypy/-/issues/3749

Author: nedbat

tests/helpers.py

@@ -15,6 +15,9 @@
 
 from unittest import mock
 
+import pytest
+
+from coverage import env
 from coverage.exceptions import CoverageWarning
 from coverage.misc import output_encoding
 
@@ -313,3 +316,9 @@ def swallow_warnings(message=r".", category=CoverageWarning):
     with warnings.catch_warnings():
         warnings.filterwarnings("ignore", category=category, message=message)
         yield
+
+
+xfail_pypy_3749 = pytest.mark.xfail(
+    env.PYVERSION[:2] == (3, 8) and env.PYPY and env.PYPYVERSION >= (7, 3, 10),
+    reason="Avoid a PyPy bug: https://foss.heptapod.net/pypy/pypy/-/issues/3749"
+)

tests/test_arcs.py

@@ -6,7 +6,7 @@
 import pytest
 
 from tests.coveragetest import CoverageTest
-from tests.helpers import assert_count_equal
+from tests.helpers import assert_count_equal, xfail_pypy_3749
 
 import coverage
 from coverage import env
@@ -1647,6 +1647,7 @@ def f(a, b):
 class DecoratorArcTest(CoverageTest):
     """Tests of arcs with decorators."""
 
+    @xfail_pypy_3749
     def test_function_decorator(self):
         arcz = (
             ".1 16 67 7A AE EF F. "     # main line
@@ -1675,6 +1676,7 @@ def my_function(
             arcz=arcz,
         )
 
+    @xfail_pypy_3749
     def test_class_decorator(self):
         arcz = (
             ".1 16 67 6D 7A AE E. "     # main line
@@ -1702,6 +1704,7 @@ class MyObject(
             arcz=arcz,
         )
 
+    @xfail_pypy_3749
     def test_bug_466a(self):
         # A bad interaction between decorators and multi-line list assignments,
         # believe it or not...!
@@ -1726,6 +1729,7 @@ def parse(cls):
             arcz=arcz,
         )
 
+    @xfail_pypy_3749
     def test_bug_466b(self):
         # A bad interaction between decorators and multi-line list assignments,
         # believe it or not...!
@@ -1919,6 +1923,7 @@ async def go():
             arcz_missing=arcz_missing,
         )
 
+    @xfail_pypy_3749
     def test_async_decorator(self):
         arcz = ".1 14 4.     .2 2.  -46 6-4 "
         if env.PYBEHAVIOR.trace_decorated_def:

tests/test_coverage.py

@@ -10,6 +10,7 @@
 from coverage.exceptions import NoDataError
 
 from tests.coveragetest import CoverageTest
+from tests.helpers import xfail_pypy_3749
 
 
 class TestCoverageTest(CoverageTest):
@@ -1617,6 +1618,7 @@ def test_excluded_comprehension_branches(self):
 class Py24Test(CoverageTest):
     """Tests of new syntax in Python 2.4."""
 
+    @xfail_pypy_3749
     def test_function_decorators(self):
         lines = [1, 2, 3, 4, 6, 8, 10, 12]
         if env.PYBEHAVIOR.trace_decorated_def:
@@ -1637,6 +1639,7 @@ def p1(arg):
             """,
             lines, "")
 
+    @xfail_pypy_3749
     def test_function_decorators_with_args(self):
         lines = [1, 2, 3, 4, 5, 6, 8, 10, 12]
         if env.PYBEHAVIOR.trace_decorated_def:
@@ -1657,6 +1660,7 @@ def boosted(arg):
             """,
             lines, "")
 
+    @xfail_pypy_3749
     def test_double_function_decorators(self):
         lines = [1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 14, 15, 17, 19, 21, 22, 24, 26]
         if env.PYBEHAVIOR.trace_decorated_def:

tests/test_parser.py

@@ -14,7 +14,7 @@
 from coverage.parser import ast_dump, ast_parse, PythonParser
 
 from tests.coveragetest import CoverageTest, TESTS_DIR
-from tests.helpers import arcz_to_arcs, re_lines
+from tests.helpers import arcz_to_arcs, re_lines, xfail_pypy_3749
 
 
 class PythonParserTest(CoverageTest):
@@ -139,10 +139,7 @@ def test_token_error(self):
                 '''
                 """)
 
-    @pytest.mark.xfail(
-        env.PYPY and env.PYPYVERSION == (7, 3, 0),
-        reason="https://bitbucket.org/pypy/pypy/issues/3139",
-    )
+    @xfail_pypy_3749
     def test_decorator_pragmas(self):
         parser = self.parse_source("""\
             # 1
@@ -178,6 +175,7 @@ def func(x=25):
         assert parser.raw_statements == raw_statements
         assert parser.statements == {8}
 
+    @xfail_pypy_3749
     def test_decorator_pragmas_with_colons(self):
         # A colon in a decorator expression would confuse the parser,
         # ending the exclusion of the decorated function.
@@ -212,6 +210,7 @@ def __init__(self):
         assert parser.raw_statements == {1, 2, 3, 5, 6, 7, 8}
         assert parser.statements == {1, 2, 3}
 
+    @xfail_pypy_3749
     def test_empty_decorated_function(self):
         parser = self.parse_source("""\
             def decorator(func):