Add thread test in dispatch test

Author: rocky

trepan/lib/core.py

@@ -68,6 +68,7 @@ def get_option(key: str) -> Any:
 
         self.bpmgr = BreakpointManager()
         self.current_bp = None
+        self.current_thread = None
         self.debugger = debugger
 
         # Threading lock ensures that we don't have other traced threads
@@ -400,6 +401,7 @@ def set_next(self, frame, step_ignore=0, step_events=None):
         self.stop_level = count_frames(frame)
         self.last_level = self.stop_level
         self.last_frame = frame
+        self.current_thread = threading.current_thread()
         self.stop_on_finish = False
         self.step_ignore = step_ignore
         return
@@ -420,13 +422,14 @@ def trace_dispatch(self, frame, event: str, arg):
         # that we don't have any breakpoint set, since we have to check
         # for breakpoints in a kind of slow way of checking all events.
 
-        # TODO: add thread check
+
         if (
             event == "call"
             and self.last_frame != frame
             and len(self.bpmgr.bplist) == 0
             and self.stop_level is not None
             and self.stop_level < count_frames(frame)
+            and self.current_thread == threading.current_thread()
         ):
             # We are "finish"ing or "next"ing and should not be tracing into this call
             # or any other calls from this. Return Nont to not trace further.