Address further review comments

Author: SLTozer

lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py

@@ -176,8 +176,7 @@ def verify_breakpoint_hit(self, breakpoint_ids, timeout=DEFAULT_TIMEOUT):
     def verify_all_breakpoints_hit(self, breakpoint_ids, timeout=DEFAULT_TIMEOUT):
         """Wait for the process we are debugging to stop, and verify we hit
         all of the breakpoint locations in the "breakpoint_ids" array.
-        "breakpoint_ids" should be a list of breakpoint ID strings
-        (["1", "2"])."""
+        "breakpoint_ids" should be a list of int breakpoint IDs ([1, 2])."""
         stopped_events = self.dap_server.wait_for_stopped(timeout)
         for stopped_event in stopped_events:
             if "body" in stopped_event:
@@ -192,9 +191,7 @@ def verify_all_breakpoints_hit(self, breakpoint_ids, timeout=DEFAULT_TIMEOUT):
                 if "hitBreakpointIds" not in body:
                     continue
                 hit_bps = body["hitBreakpointIds"]
-                if all(
-                    int(breakpoint_id) in hit_bps for breakpoint_id in breakpoint_ids
-                ):
+                if all(breakpoint_id in hit_bps for breakpoint_id in breakpoint_ids):
                     return
         self.assertTrue(False, f"breakpoints not hit, stopped_events={stopped_events}")
 

lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py

@@ -404,15 +404,18 @@ def test_hit_multiple_breakpoints(self):
         """Test that if we hit multiple breakpoints at the same address, they
         all appear in the stop reason."""
         breakpoint_lines = [
-            line_number("main.cpp", "// end of foo check"),
+            line_number("main.cpp", "// break non-breakpointable line"),
             line_number("main.cpp", "// before loop"),
         ]
 
         program = self.getBuildArtifact("a.out")
         self.build_and_launch(program)
 
         # Set a pair of breakpoints that will both resolve to the same address.
-        breakpoint_ids = self.set_source_breakpoints(self.main_path, breakpoint_lines)
+        breakpoint_ids = [
+            int(bp_id)
+            for bp_id in self.set_source_breakpoints(self.main_path, breakpoint_lines)
+        ]
         self.assertEqual(len(breakpoint_ids), 2, "expected two breakpoints")
         self.dap_server.request_continue()
         print(breakpoint_ids)

lldb/test/API/tools/lldb-dap/breakpoint/main.cpp

@@ -33,7 +33,7 @@ int main(int argc, char const *argv[]) {
   if (foo == nullptr) {
     fprintf(stderr, "%s\n", dlerror());
     exit(2);
-  } // end of foo check
+  }        // break non-breakpointable line
   foo(12); // before loop
 
   for (int i = 0; i < 10; ++i) {