Adapt to 3.8's way of tracing decorated functions

2 files changed, 26 insertions, 7 deletions

diff --git a/tests/test_coverage.py b/tests/test_coverage.py
index 676fc831..60205900 100644
--- a/tests/test_coverage.py
+++ b/tests/test_coverage.py
@@ -1579,6 +1579,9 @@ class Py24Test(CoverageTest):
     """Tests of new syntax in Python 2.4."""
 
     def test_function_decorators(self):
+        lines = [1, 2, 3, 4, 6, 8, 10, 12]
+        if env.PYBEHAVIOR.trace_decorated_def:
+            lines = sorted(lines + [9])
         self.check_coverage("""\
             def require_int(func):
                 def wrapper(arg):
@@ -1593,9 +1596,12 @@ class Py24Test(CoverageTest):
 
             assert p1(10) == 20
             """,
-            [1,2,3,4,6,8,10,12], "")
+            lines, "")
 
     def test_function_decorators_with_args(self):
+        lines = [1, 2, 3, 4, 5, 6, 8, 10, 12]
+        if env.PYBEHAVIOR.trace_decorated_def:
+            lines = sorted(lines + [9])
         self.check_coverage("""\
             def boost_by(extra):
                 def decorator(func):
@@ -1610,9 +1616,12 @@ class Py24Test(CoverageTest):
 
             assert boosted(10) == 200
             """,
-            [1,2,3,4,5,6,8,10,12], "")
+            lines, "")
 
     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:
+            lines = sorted(lines + [16, 23])
         self.check_coverage("""\
             def require_int(func):
                 def wrapper(arg):
@@ -1641,8 +1650,7 @@ class Py24Test(CoverageTest):
 
             assert boosted2(10) == 200
             """,
-            ([1,2,3,4,5,7,8,9,10,11,12,14,15,17,19,21,22,24,26],
-             [1,2,3,4,5,7,8,9,10,11,12,14,   17,19,21,   24,26]), "")
+            lines, "")
 
 
 class Py25Test(CoverageTest):
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 6340a44b..e6768a22 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -166,6 +166,8 @@ class PythonParserTest(CoverageTest):
                 return 26
             """)
         raw_statements = set([3, 4, 5, 6, 8, 9, 10, 13, 15, 16, 17, 20, 22, 23, 25, 26])
+        if env.PYBEHAVIOR.trace_decorated_def:
+            raw_statements.update([11, 19, 25])
         self.assertEqual(parser.raw_statements, raw_statements)
         self.assertEqual(parser.statements, set([8]))
 
@@ -196,13 +198,22 @@ class PythonParserTest(CoverageTest):
             def bar(self):
                 pass
             """)
-        self.assertEqual(parser.statements, set([1, 2, 4, 8, 10]))
-        expected_arcs = set(self.arcz_to_arcs(".1 14 48 8.  .2 2.  -8A A-8"))
-        expected_exits = {1: 1, 2: 1, 4: 1, 8: 1, 10: 1}
+
+        if env.PYBEHAVIOR.trace_decorated_def:
+            expected_statements = {1, 2, 4, 5, 8, 9, 10}
+            expected_arcs = set(self.arcz_to_arcs(".1 14 45 58 89 9.  .2 2.  -8A A-8"))
+            expected_exits = {1: 1, 2: 1, 4: 1, 5: 1, 8: 1, 9: 1, 10: 1}
+        else:
+            expected_statements = {1, 2, 4, 8, 10}
+            expected_arcs = set(self.arcz_to_arcs(".1 14 48 8.  .2 2.  -8A A-8"))
+            expected_exits = {1: 1, 2: 1, 4: 1, 8: 1, 10: 1}
+
         if env.PYVERSION >= (3, 7, 0, 'beta', 5):
             # 3.7 changed how functions with only docstrings are numbered.
             expected_arcs.update(set(self.arcz_to_arcs("-46 6-4")))
             expected_exits.update({6: 1})
+
+        self.assertEqual(parser.statements, expected_statements)
         self.assertEqual(parser.arcs(), expected_arcs)
         self.assertEqual(parser.exit_counts(), expected_exits)