tests: fixes for 3.14+

bretello · bretello · commit 56e8e340e70e · 2025-11-17T14:42:45.000+01:00
With 3.14, breakpoints use the most recently created Pdb instance, in order to maintain history, display commands etc. See gh-121450: python/cpython#121451 Also includes misc fixes tests: - test_break_with_inner_set_trace - test_set_trace_remembers_previous_state - set_trace/set_trace_via_module - set_trace_with_incomplete_pdb - test_commands_* - test_nested_completer - test_integration - fix fixtures (set_trace, ...)
diff --git a/testing/conftest.py b/testing/conftest.py
@@ -146,7 +146,10 @@ def monkeypatch_pdb_methods(monkeypatch):
     def mock(method, *args, **kwargs):
         print(f"=== {method}({args}, {kwargs})")
 
-    for mock_method in ("set_trace", "set_continue"):
+    methods_to_mock = ["set_trace", "set_continue"]
+    if sys.version_info >= (3, 14):
+        methods_to_mock.append("_last_pdb_instance")
+    for mock_method in methods_to_mock:
         monkeypatch.setattr(
             f"pdbpp.pdb.Pdb.{mock_method}", functools.partial(mock, mock_method)
         )
diff --git a/testing/test_integration.py b/testing/test_integration.py
@@ -43,7 +43,11 @@ def test_integration(pytester, readline_param):
     # Completes breakpoints via pdb, should not contain "\t" from
     # fancycompleter.
     child.send(b"b \t")
-    child.expect(b"b.*test_file.py:")
+    if sys.version_info < (3, 14):
+        child.expect(b"b.*test_file.py:")
+    else:
+        child.expect_exact("\x1b[0mb test_file\x1b[0m.\x1b[0mpy\x1b[0m:")
+
     child.sendline()
     child.sendline("c")
     child.expect("after")
diff --git a/testing/test_pdb.py b/testing/test_pdb.py
@@ -87,6 +87,8 @@ class ConfigWithPygmentsAndHighlight(ConfigWithPygments, ConfigWithHighlight):
 
 class PdbTest(pdbpp.Pdb):
     use_rawinput = 1
+    # For the sake of testing, let's never reuse the last pdb instance (3.14+)
+    _last_pdb_instance = None
 
     def __init__(self, *args, **kwds):
         readrc = kwds.pop("readrc", False)
@@ -532,25 +534,21 @@ def fn():
         return a
 
     if sys.version_info >= (3, 13):
-
-        def get_trace_lines_str(cleanup=True) -> str:
-            """helper to avoid repeating set_trace() lines"""
-
-            return f"""
+        expected = textwrap.dedent(
+            """
             [NUM] > .*fn()
-            -> set_trace({"cleanup=False" if not cleanup else ""})
+            -> set_trace(.*)
                5 frames hidden .*
-            """.strip()
-
-        expected = textwrap.dedent(
-            f"""
-            {get_trace_lines_str()}
             # display a
             # c
-            {get_trace_lines_str(cleanup=False)}
+            [NUM] > .*fn()
+            -> set_trace(cleanup=False)
+               5 frames hidden .*
             a: 1 --> 2
             # c
-            {get_trace_lines_str(cleanup=False)}
+            [NUM] > .*fn()
+            -> set_trace(cleanup=False)
+               5 frames hidden .*
             a: 2 --> 3
             # c
             """,
@@ -5633,8 +5631,9 @@ def inner():
 
     _, lineno = inspect.getsourcelines(fn)
 
-    expected = (
-        f"""
+    if sys.version_info < (3, 14):
+        expected = (
+            f"""
         [NUM] > .*fn()
         -> inner()
            5 frames hidden .*
@@ -5643,29 +5642,50 @@ def inner():
         # c
         --Return--
         """.rstrip()
-        + (
-            """
+            + (
+                """
         [NUM] .*set_trace()
         -> Pdb(.*).set_trace(frame)
            5 frames hidden .*
         # n
-        --Return-
+        --Return--
         [NUM] .*inner()
         """
-            if sys.version_info >= (3, 13)
-            else """
+                if sys.version_info >= (3, 13)
+                else """
         [NUM] > .*inner()->None
         """
-        )
-        + """
+            )
+            + """
         -> set_trace(cleanup=False)
            5 frames hidden .*
         # import pdb; pdbpp.local.GLOBAL_PDB.clear_all_breaks()
         # c
         1
         """.lstrip()
-    )
-    check(fn, expected, add_313_fix=True)
+        )
+        check(fn, expected, add_313_fix=True)
+    else:
+        expected = f"""
+        [NUM] > .*fn()
+        -> set_trace()
+           5 frames hidden .*
+        # break {lineno + 8}
+        Breakpoint . at .*:{lineno + 8}
+        # c
+        [NUM] .*inner()
+        -> set_trace(cleanup=False)
+           5 frames hidden .*
+        # n
+        --Return--
+        [NUM] .*inner()->None
+        -> set_trace(cleanup=False)
+           5 frames hidden .*
+        # import pdb; pdbpp.local.GLOBAL_PDB.clear_all_breaks()
+        # c
+        1
+        """
+        check(fn, expected)
 
 
 def test_pdbrc_continue(tmpdirhome):
@@ -6327,17 +6347,26 @@ class Config(DefaultConfig):
             """)
         )
     testdir.monkeypatch.setenv("PDBPP_COLORS", "0")
-    child = testdir.spawn(f"{quote(sys.executable)} {str(p1)}")
+    child = testdir.spawn(f"{quote(sys.executable)} {str(p1)}", expect_timeout=1)
     child.send("completeme\t")
-    child.expect_exact("\r\n(Pdb++) completeme_outer")
+    if sys.version_info < (3, 14):
+        child.expect_exact("\r\n(Pdb++) completeme_outer")
+    else:
+        child.expect_exact("\r\n(Pdb++) completeme\x07\r\x1b[19G_outer")
     child.send("\nimport pdbpp; _p = pdbpp.Pdb(); _p.reset()")
     child.send("\n_p.interaction(frames[0], None)\n")
     child.expect_exact("\r\n-> frames.append(sys._getframe())\r\n(Pdb++) ")
     child.send("completeme\t")
-    child.expect_exact("completeme_inner")
+    if sys.version_info < (3, 14):
+        child.expect_exact("completeme_inner")
+    else:
+        child.expect_exact("completeme\x07\r\x1b[19G_inner")
     child.send("\nq\n")
     child.send("completeme\t")
-    child.expect_exact("completeme_outer")
+    if sys.version_info < (3, 14):
+        child.expect_exact("completeme_outer")
+    else:
+        child.expect_exact("completeme\x07\r\x1b[19G_outer")
     child.send("\n")
     child.sendeof()
 
@@ -8049,7 +8078,8 @@ def f():
             f()
 
     def test_commands_with_sticky(self):
-        expected = r"""
+        expected = (
+            r"""
             [NUM] > .*fn()
             -> for i in range(5):
                5 frames hidden .*
@@ -8077,21 +8107,38 @@ def test_commands_with_sticky(self):
             0
             1
             3
+            """.rstrip()
+            + (
+                """
             stop 6
             [NUM] > .*f(), 5 frames hidden
 
             NUM             def f():
             NUM  ->             print(a)
+            """
+                if (sys.version_info < (3, 14))
+                # before 3.14 location information is printed after calling f(), in 3.14 it's called after
+                else """
+            [NUM] > .*f(), 5 frames hidden
+
+            NUM             def f():
+            NUM  ->             print(a)
+            stop 6
+            """
+            ).rstrip()
+            + """
             # import pdb; pdbpp.local.GLOBAL_PDB.clear_all_breaks()
             # c
             6
             10
             """
+        )
 
         check(self.fn, expected, add_313_fix=True)
 
     def test_commands_without_sticky(self):
-        expected = r"""
+        expected = (
+            r"""
             [NUM] > .*fn()
             -> for i in range(5):
                5 frames hidden .*
@@ -8104,13 +8151,28 @@ def test_commands_without_sticky(self):
             0
             1
             3
+            """.rstrip()
+            + (
+                """
             stop 6
             [NUM] > .*f()$
             -> print(a)
+            """
+                if sys.version_info < (3, 14)
+                # before 3.14 location information is printed after calling f(), in 3.14 it's called after
+                else """
+            [NUM] > .*f()
+            -> print(a)
+               5 frames hidden
+            stop 6
+            """
+            ).rstrip()
+            + """
             # import pdb; pdbpp.local.GLOBAL_PDB.clear_all_breaks()
             # c
             6
             10
             """
+        )
 
         check(self.fn, expected, add_313_fix=True)
