Creating a dedicated assert for capabilities and adjusting 'get_capability' to raise.

Author: ashgti

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

@@ -135,7 +135,7 @@ def as_dict(self):
         return source_dict
 
 
-class NotSupportedError(Exception):
+class NotSupportedError(KeyError):
     """Raised if a feature is not supported due to its capabilities."""
 
 
@@ -495,11 +495,13 @@ def wait_for_terminated(self, timeout: Optional[float] = None):
             raise ValueError("didn't get terminated event")
         return event_dict
 
-    def get_capability(self, key, default=None):
+    def get_capability(self, key):
         """Get a value for the given key if it there is a key/value pair in
         the capabilities reported by the adapter.
         """
-        return self.capabilities.get(key, default)
+        if key in self.capabilities:
+            return self.capabilities[key]
+        raise NotSupportedError(key)
 
     def get_threads(self):
         if self.threads is None:
@@ -767,8 +769,7 @@ def request_continue(self, threadId=None, singleThread=False):
     def request_restart(self, restartArguments=None):
         if self.exit_status is not None:
             raise ValueError("request_restart called after process exited")
-        if not self.get_capability("supportsRestartRequest", False):
-            raise NotSupportedError("supportsRestartRequest is not set")
+        self.get_capability("supportsRestartRequest")
         command_dict = {
             "command": "restart",
             "type": "request",
@@ -981,8 +982,7 @@ def request_stepIn(self, threadId, targetId, granularity="statement"):
     def request_stepInTargets(self, frameId):
         if self.exit_status is not None:
             raise ValueError("request_stepInTargets called after process exited")
-        if not self.get_capability("supportsStepInTargetsRequest", False):
-            raise NotSupportedError("supportsStepInTargetsRequest is not set")
+        self.get_capability("supportsStepInTargetsRequest")
         args_dict = {"frameId": frameId}
         command_dict = {
             "command": "stepInTargets",

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

@@ -128,6 +128,16 @@ def waitUntil(self, condition_callback):
             time.sleep(0.5)
         return False
 
+    def assertCapabilityIsSet(self, key: str, msg: Optional[str] = None) -> None:
+        """Assert that given capability is set in the client."""
+        self.assertIn(key, self.dap_server.capabilities, msg)
+        self.assertTrue(self.dap_server.capabilities[key], msg)
+
+    def assertCapabilityIsNotSet(self, key: str, msg: Optional[str] = None) -> None:
+        """Assert that given capability is not set in the client."""
+        if key in self.dap_server.capabilities:
+            self.assertFalse(self.dap_server.capabilities[key], msg)
+
     def verify_breakpoint_hit(self, breakpoint_ids, timeout=DEFAULT_TIMEOUT):
         """Wait for the process we are debugging to stop, and verify we hit
         any breakpoint location in the "breakpoint_ids" array.