Adjust the naming of the test dap_server.DebugAdaptorServer to be more consistent.

Author: ashgti

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

@@ -1155,25 +1155,27 @@ def __init__(
         self,
         executable=None,
         launch=True,
-        connect=None,
+        port=None,
+        unix_socket=None,
         init_commands=[],
         log_file=None,
         env=None,
     ):
         self.process = None
         if launch:
             self.process = DebugAdaptorServer.launch(
-                executable, connect=connect, log_file=log_file, env=env
+                executable, port=port, unix_socket=unix_socket, log_file=log_file, env=env
             )
 
-        if connect:
-            if isinstance(connect, str) and connect.startswith("/"):
-                s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-                s.connect(connect)
-            else:
-                port = int(connect)
-                s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                s.connect(("127.0.0.1", port))
+        if port:
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            s.connect(("127.0.0.1", port))
+            DebugCommunication.__init__(
+                self, s.makefile("rb"), s.makefile("wb"), init_commands, log_file
+            )
+        elif unix_socket:
+            s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            s.connect(unix_socket)
             DebugCommunication.__init__(
                 self, s.makefile("rb"), s.makefile("wb"), init_commands, log_file
             )
@@ -1196,7 +1198,7 @@ def terminate(self):
 
     @classmethod
     def launch(
-        cls, executable: str, /, connect=None, log_file=None, env=None
+        cls, executable: str, /, port=None, unix_socket=None, log_file=None, env=None
     ) -> subprocess.Popen:
         adaptor_env = os.environ.copy()
         if env:
@@ -1206,13 +1208,12 @@ def launch(
             adaptor_env["LLDBDAP_LOG"] = log_file
 
         args = [executable]
-        if connect:
-            if isinstance(connect, str) and connect.startswith("/"):
-                args.append("--unix-socket")
-                args.append(connect)
-            else:
-                args.append("--port")
-                args.append(str(connect))
+        if port:
+            args.append("--port")
+            args.append(str(port))
+        elif unix_socket:
+            args.append("--unix-socket")
+            args.append(unix_socket)
 
         proc = subprocess.Popen(
             args,
@@ -1222,7 +1223,7 @@ def launch(
             env=adaptor_env,
         )
 
-        if connect:
+        if port or unix_socket:
             # Wait for the server to startup.
             time.sleep(0.1)
 

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

@@ -13,7 +13,7 @@ class DAPTestCaseBase(TestBase):
     timeoutval = 10 * (10 if ('ASAN_OPTIONS' in os.environ) else 1)
     NO_DEBUG_INFO_TESTCASE = True
 
-    def create_debug_adaptor(self, env=None, launch=True, connect=None):
+    def create_debug_adaptor(self, env=None, launch=True, port=None, unix_socket=None):
         """Create the Visual Studio Code debug adaptor"""
         self.assertTrue(
             is_exe(self.lldbDAPExec), "lldb-dap must exist and be executable"
@@ -22,18 +22,19 @@ def create_debug_adaptor(self, env=None, launch=True, connect=None):
         self.dap_server = dap_server.DebugAdaptorServer(
             executable=self.lldbDAPExec,
             launch=launch,
-            connect=connect,
+            port=port,
+            unix_socket=unix_socket,
             init_commands=self.setUpCommands(),
             log_file=log_file_path,
             env=env,
         )
 
     def build_and_create_debug_adaptor(
-        self, lldbDAPEnv=None, lldbDAPLaunch=True, lldbDAPConnect=None
+        self, lldbDAPEnv=None, lldbDAPLaunch=True, lldbDAPPort=None, lldbDAPUnixSocket=None
     ):
         self.build()
         self.create_debug_adaptor(
-            lldbDAPEnv, launch=lldbDAPLaunch, connect=lldbDAPConnect
+            lldbDAPEnv, launch=lldbDAPLaunch, port=lldbDAPPort, unix_socket=lldbDAPUnixSocket
         )
 
     def set_source_breakpoints(self, source_path, lines, data=None):
@@ -481,13 +482,14 @@ def build_and_launch(
         customThreadFormat=None,
         launchCommands=None,
         expectFailure=False,
-        lldbDAPConnect=None,
+        lldbDAPPort=None,
+        lldbDAPUnixSocket=None,
         lldbDAPLaunch=True,
     ):
         """Build the default Makefile target, create the DAP debug adaptor,
         and launch the process.
         """
-        self.build_and_create_debug_adaptor(lldbDAPEnv, lldbDAPLaunch, lldbDAPConnect)
+        self.build_and_create_debug_adaptor(lldbDAPEnv=lldbDAPEnv, lldbDAPLaunch=lldbDAPLaunch, lldbDAPPort=lldbDAPPort, lldbDAPUnixSocket=lldbDAPUnixSocket)
         self.assertTrue(os.path.exists(program), "executable must exist")
 
         return self.launch(

lldb/test/API/tools/lldb-dap/server/TestDAP_server.py

@@ -12,11 +12,10 @@
 
 
 class TestDAP_server(lldbdap_testcase.DAPTestCaseBase):
-    def do_test_server(self, connect):
+    def do_test_server(self, port=None, unix_socket=None):
         log_file_path = self.getBuildArtifact("dap.txt")
-        print("connect", connect)
         server = dap_server.DebugAdaptorServer.launch(
-            self.lldbDAPExec, connect=connect, log_file=log_file_path
+            self.lldbDAPExec, port=port, unix_socket=unix_socket, log_file=log_file_path
         )
 
         def cleanup():
@@ -31,7 +30,7 @@ def cleanup():
         breakpoint_line = line_number(source, "// breakpoint")
 
         # Initial connection over the port.
-        self.create_debug_adaptor(launch=False, connect=connect)
+        self.create_debug_adaptor(launch=False, port=port, unix_socket=unix_socket)
         self.launch(
             program,
             disconnectAutomatically=False,
@@ -44,7 +43,7 @@ def cleanup():
         self.dap_server.request_disconnect()
 
         # Second connection over the port.
-        self.create_debug_adaptor(launch=False, connect=connect)
+        self.create_debug_adaptor(launch=False, port=port, unix_socket=unix_socket)
         self.launch(program)
         self.set_source_breakpoints(source, [breakpoint_line])
         self.continue_to_next_stop()
@@ -57,11 +56,11 @@ def test_server_port(self):
         Test launching a binary with a lldb-dap in server mode on a specific port.
         """
         port = pickrandomport()
-        self.do_test_server(port)
+        self.do_test_server(port=port)
 
     def test_server_unix_socket(self):
         """
         Test launching a binary with a lldb-dap in server mode on a unix socket.
         """
         dir = tempfile.gettempdir()
-        self.do_test_server(dir + "/dap-connection-" + str(os.getpid()))
+        self.do_test_server(unix_socket=dir + "/dap-connection-" + str(os.getpid()))