.

Author: Pavel Minaev

tests/debug/config.py

@@ -125,6 +125,9 @@ def __setitem__(self, key, value):
         assert key in self.PROPERTIES
         self._dict[key] = value
 
+    def __repr__(self):
+        return repr(dict(self))
+
     def __getstate__(self):
         return dict(self)
 

tests/debug/session.py

@@ -133,6 +133,10 @@ def __init__(self, debug_config=None):
         self.scratchpad = comms.ScratchPad(self)
         """The ScratchPad object to talk to the debuggee."""
 
+        self.start_command = None
+        """Set to either "launch" or "attach" just before the corresponding request is sent.
+        """
+
         self.start_request = None
         """The "launch" or "attach" request that started executing code in this session.
         """
@@ -494,8 +498,12 @@ def send_request(self, command, arguments=None, proceed=True):
         if self.timeline.is_frozen and proceed:
             self.proceed()
 
+        if command in ("launch", "attach"):
+            self.start_command = command
+
         message = self.channel.send_request(command, arguments)
         request = self.timeline.record_request(message)
+
         if command in ("launch", "attach"):
             self.start_request = request
 
@@ -539,10 +547,7 @@ def _process_event(self, event):
                 sockets.remove(socket)
             assert not sockets, f"Unexpected sockets reported by adapter: {sockets}"
 
-            if (
-                self.start_request is not None
-                and self.start_request.command == "launch"
-            ):
+            if self.start_command == "launch":
                 if "launcher" in self.expected_adapter_sockets:
                     # If adapter has just reported the launcher socket, it shouldn't be
                     # reported thereafter.