[Lldb-commits] [lldb] 0530817 - [NFC][lldb-dap] Simplify DAP imports. (#209442)
via lldb-commits
lldb-commits at lists.llvm.org
Tue Jul 14 08:51:57 PDT 2026
Author: Ebuka Ezike
Date: 2026-07-14T16:51:52+01:00
New Revision: 0530817558e92a99ad3a37372dc42eb165f5f69e
URL: https://github.com/llvm/llvm-project/commit/0530817558e92a99ad3a37372dc42eb165f5f69e
DIFF: https://github.com/llvm/llvm-project/commit/0530817558e92a99ad3a37372dc42eb165f5f69e.diff
LOG: [NFC][lldb-dap] Simplify DAP imports. (#209442)
Expose commonly used classes in the lldb_dap package and avoid repeating
the lldb_dap namespace.
Added:
lldb/packages/Python/lldbsuite/test/tools/lldb_dap/testcase.py
lldb/packages/Python/lldbsuite/test/tools/lldb_dap/types.py
Modified:
lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py
lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py
lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py
lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py
lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py
lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py
lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py
lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py
lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_termination.py
lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_version.py
lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py
lldb/test/API/tools/lldb-dap/module/TestDAP_module.py
lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py
lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py
lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py
lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py
lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py
lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py
lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_DAPConnection.py
lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py
lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py
lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py
Removed:
lldb/packages/Python/lldbsuite/test/tools/lldb_dap/dap_types.py
lldb/packages/Python/lldbsuite/test/tools/lldb_dap/lldb_dap_testcase.py
################################################################################
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py
index 5e378bfd8b97f..d5f2732a56073 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/__init__.py
@@ -1,5 +1,13 @@
-from .lldb_dap_testcase import DAPTestCaseBase
-from .session_helpers import DAPTestSession
-from .utils import DebugAdapter, DebugAdapterOptions
+from .testcase import DAPTestCaseBase
+from .session_helpers import DAPTestSession, ExpectEval, ExpectVar
+from .utils import DAPConnection, DebugAdapter, DebugAdapterOptions
-__all__ = ["DAPTestCaseBase", "DAPTestSession", "DebugAdapter", "DebugAdapterOptions"]
+__all__ = [
+ "DAPConnection",
+ "DAPTestCaseBase",
+ "DAPTestSession",
+ "DebugAdapter",
+ "DebugAdapterOptions",
+ "ExpectEval",
+ "ExpectVar",
+]
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py
index 156c3e2a41d0d..70c1d2ef43b1d 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session.py
@@ -15,7 +15,7 @@
from pathlib import Path
from typing import Any, Callable, Generic, Optional, Type, TypeVar
-from .dap_types import (
+from .types import (
AnyResponse,
ArgsProtocol,
Capabilities,
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py
index 35a2d6c2f281a..29f6d52571c67 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/session_helpers.py
@@ -19,7 +19,7 @@
cast,
)
-from .dap_types import (
+from .types import (
AttachArgs,
Breakpoint,
BreakpointEvent,
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/lldb_dap_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/testcase.py
similarity index 99%
rename from lldb/packages/Python/lldbsuite/test/tools/lldb_dap/lldb_dap_testcase.py
rename to lldb/packages/Python/lldbsuite/test/tools/lldb_dap/testcase.py
index ac74770e2e4bc..18085e5156aef 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/lldb_dap_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/testcase.py
@@ -5,7 +5,7 @@
from lldbsuite.test.lldbtest import Base, LLDBTestCaseFactory, is_exe
-from .dap_types import AnyResponse, ErrorResponse, Response
+from .types import AnyResponse, ErrorResponse, Response
from .session_helpers import DAPTestSession
from .utils import DebugAdapter, DebugAdapterOptions
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/dap_types.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/types.py
similarity index 100%
rename from lldb/packages/Python/lldbsuite/test/tools/lldb_dap/dap_types.py
rename to lldb/packages/Python/lldbsuite/test/tools/lldb_dap/types.py
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py
index 61147e3e31e52..3251475173866 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb_dap/utils.py
@@ -16,7 +16,7 @@
from pprint import pformat
from typing import IO, Callable, Optional, Protocol, Tuple, Type, runtime_checkable
-from .dap_types import (
+from .types import (
AnyEvent,
DAPError,
Event,
diff --git a/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py b/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py
index c1657853e8c94..23e8763cf8d81 100644
--- a/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py
+++ b/lldb/test/API/tools/lldb-dap/exception/TestDAP_exception.py
@@ -2,13 +2,13 @@
Test exception behavior in DAP with signal.
"""
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.decorators import skipIfNoSignals
-from lldbsuite.test.tools.lldb_dap import lldb_dap_testcase
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
@skipIfNoSignals
-class TestDAP_exception(lldb_dap_testcase.DAPTestCaseBase):
+class TestDAP_exception(DAPTestCaseBase):
def test_stopped_description(self):
"""
Test that exception description is shown correctly in stopped
diff --git a/lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py b/lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py
index 7f6afd078219a..ea7b750d90c82 100644
--- a/lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py
+++ b/lldb/test/API/tools/lldb-dap/exception/asan/TestDAP_asan.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.decorators import skipUnlessAddressSanitizer
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_asan(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py b/lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py
index 49a3907b94bf0..4cd2f8bf1e0f7 100644
--- a/lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py
+++ b/lldb/test/API/tools/lldb-dap/exception/cpp/TestDAP_exception_cpp.py
@@ -4,8 +4,8 @@
from lldbsuite.test.decorators import skipIfWasm, skipIfWindows
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
@skipIfWasm # wasm inferiors are built with -fno-exceptions.
diff --git a/lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py b/lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py
index cbabbb19dfea0..5d56744dc77fe 100644
--- a/lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py
+++ b/lldb/test/API/tools/lldb-dap/exception/objc/TestDAP_exception_objc.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.decorators import skipUnlessDarwin
-from lldbsuite.test.tools.lldb_dap.dap_types import ExceptionFilterOptions, LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import ExceptionFilterOptions, LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_exception_objc(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py b/lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py
index fd2d46c730972..1981823dbc1bd 100644
--- a/lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py
+++ b/lldb/test/API/tools/lldb-dap/exception/ubsan/TestDAP_ubsan.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.decorators import skipUnlessUndefinedBehaviorSanitizer
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_ubsan(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py
index 98091e63d58cf..2acc7e9f2f8f2 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_args.py
@@ -2,8 +2,8 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_args(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py
index 8cbad660651b6..48a27822ea265 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_basic.py
@@ -2,11 +2,11 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.tools.lldb_dap import lldb_dap_testcase
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
-class TestDAP_launch_basic(lldb_dap_testcase.DAPTestCaseBase):
+class TestDAP_launch_basic(DAPTestCaseBase):
"""
Tests the default launch of a simple program. No arguments,
environment, or anything else is specified.
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py
index 21a3f61460de5..f620b90afe5aa 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_commands.py
@@ -4,8 +4,8 @@
from lldbsuite.test.decorators import skipIf
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_commands(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py
index a7e4ffab3d640..21fac2b785b88 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_cwd.py
@@ -4,8 +4,8 @@
import os
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_cwd(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py
index 6bf470ed142e3..8de9a89517733 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_debuggerRoot.py
@@ -5,8 +5,8 @@
import os
from lldbsuite.test import lldbplatformutil
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_debuggerRoot(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py
index 39d350f3e9d57..25ee2c363c981 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_disableSTDIO.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_disableSTDIO(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py
index 2e96a1139c937..c87bad80d8c6c 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_array.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_environment_with_array(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py
index a853bbc341791..b24c800bac0ee 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_environment_with_object.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_environment_with_object(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py
index 92c481ad9d42d..946c57db1f948 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_extra_launch_commands.py
@@ -4,8 +4,8 @@
from lldbsuite.test.decorators import skipIf
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_extra_launch_commands(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py
index c4dc50ad463e6..b0208bc0afce4 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_console.py
@@ -2,8 +2,8 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_failing_console(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py
index 13730ed311206..d15572d6afaa6 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_failing_launch_commands.py
@@ -5,8 +5,8 @@
import os
import re
-from lldbsuite.test.tools.lldb_dap.dap_types import InitializedEvent, LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import InitializedEvent, LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_failing_launch_commands(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py
index dfd28e6b7f783..23ba827039a27 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_launch_commands_and_console.py
@@ -2,8 +2,8 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.tools.lldb_dap.dap_types import Console, LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import Console, LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_invalid_launch_commands_and_console(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py
index 60746599a2638..08461bc8dd6b7 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_invalid_program.py
@@ -2,8 +2,8 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_invalid_program(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py
index 22cfcf3078b11..1704129344295 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_no_lldbinit_flag.py
@@ -5,8 +5,8 @@
import os
import tempfile
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.utils import DebugAdapterOptions
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py
index 38157849facfb..726ec61779688 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_disabled.py
@@ -4,8 +4,8 @@
import os
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_shellExpandArguments_disabled(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py
index e5ba6a4852714..b716c3fd24c00 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_shellExpandArguments_enabled.py
@@ -5,8 +5,8 @@
import os
from lldbsuite.test.decorators import expectedFailureAll, skipIfLinux
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_shellExpandArguments_enabled(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py
index b62276c25f285..5deee899255d0 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_sourcePath.py
@@ -4,8 +4,8 @@
import os
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_sourcePath(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection.py
index 21d311076513d..2a9e841bcade1 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection.py
@@ -4,8 +4,8 @@
import tempfile
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_stdio_redirection(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py
index fa503c2aae312..505f033d0ef30 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stdio_redirection_and_console.py
@@ -11,8 +11,8 @@
skipIfBuildType,
skipIfWindows,
)
-from lldbsuite.test.tools.lldb_dap.dap_types import Console, LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import Console, LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_stdio_redirection_and_console(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py
index bbeefc5d1f793..66d3ad67c647a 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_stopOnEntry.py
@@ -2,12 +2,8 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.tools.lldb_dap.dap_types import (
- ExitedEvent,
- LaunchArgs,
- StoppedEvent,
-)
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import ExitedEvent, LaunchArgs, StoppedEvent
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_stopOnEntry(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py
index 7e89a38d6ad96..98dd226dbc878 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_terminate_commands.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.decorators import skipIf, skipIfNetBSD
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_terminate_commands(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_termination.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_termination.py
index 35cad17018113..50bf2fb88957c 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_termination.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_termination.py
@@ -2,7 +2,7 @@
Test lldb-dap launch request.
"""
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.utils import DebugAdapter
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_version.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_version.py
index 0c3609f66c7df..2a72845aeefa5 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_version.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch_version.py
@@ -1,5 +1,5 @@
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_launch_version(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py b/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py
index 63eb0e70a2f50..78c610d10ca9f 100644
--- a/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py
+++ b/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py
@@ -3,8 +3,8 @@
skipIfWindows,
)
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs, StoppedReason
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StoppedReason
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
@skipIfTargetDoesNotSupportSharedLibraries()
diff --git a/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py b/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py
index ce7a2b8dc8b1f..8e2a7bf001b93 100644
--- a/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py
+++ b/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py
@@ -7,13 +7,13 @@
from lldbsuite.test.decorators import skipIfWindows, skipUnlessDarwin
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import (
+from lldbsuite.test.tools.lldb_dap.types import (
CompileUnitsArgs,
LaunchArgs,
ModuleEvent,
ModuleReason,
)
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_module(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py b/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py
index 5a1edeb679bc5..879a12dff92e7 100644
--- a/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py
+++ b/lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs, ModuleSymbolsArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, ModuleSymbolsArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_moduleSymbols(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py b/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py
index f28cf9eac2e6a..b42a59e2dade5 100644
--- a/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py
+++ b/lldb/test/API/tools/lldb-dap/stackTrace/TestDAP_stackTrace.py
@@ -7,12 +7,12 @@
from lldbsuite.test.decorators import skipIfWindows
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import (
+from lldbsuite.test.tools.lldb_dap.types import (
LaunchArgs,
StackFrame,
StackFrameFormat,
)
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class _RecurseSource(NamedTuple):
diff --git a/lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py b/lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py
index f5bc931a4a8a2..b68a2be111fea 100644
--- a/lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py
+++ b/lldb/test/API/tools/lldb-dap/stackTraceCompilerGeneratedCode/TestDAP_stackTraceCompilerGeneratedCode.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_stackTraceCompilerGeneratedCode(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py b/lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py
index b0339c9003c0d..9688608d696e7 100644
--- a/lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py
+++ b/lldb/test/API/tools/lldb-dap/stackTraceDisassemblyDisplay/TestDAP_stackTraceDisassemblyDisplay.py
@@ -6,8 +6,8 @@
import os
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.session_helpers import ThreadContext
OTHER_C_SOURCE_CODE = """
diff --git a/lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py b/lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py
index 798ab2e14d248..b68e415f73bfb 100644
--- a/lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py
+++ b/lldb/test/API/tools/lldb-dap/stackTraceMissingFunctionName/TestDAP_stackTraceMissingFunctionName.py
@@ -3,8 +3,8 @@
"""
from lldbsuite.test.decorators import skipIfWindows
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_stackTraceMissingFunctionName(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py b/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py
index 415a687ec3268..88ebc53360477 100644
--- a/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py
+++ b/lldb/test/API/tools/lldb-dap/stackTraceMissingModule/TestDAP_stackTraceMissingModule.py
@@ -6,8 +6,8 @@
from lldbsuite.test.decorators import skipUnlessPlatform
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs, StoppedReason
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs, StoppedReason
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_stackTraceMissingModule(DAPTestCaseBase):
diff --git a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_DAPConnection.py b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_DAPConnection.py
index d4f9ecf8327ee..3cbdd2e3498fa 100644
--- a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_DAPConnection.py
+++ b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_DAPConnection.py
@@ -2,8 +2,8 @@
import json
from typing import List
-from lldbsuite.test.tools.lldb_dap.dap_types import RawMessage
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap.types import RawMessage
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.utils import DAPConnection, MessageHandler, Transport
diff --git a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py
index 5f9c0a5445a7b..8d4f51af17fe6 100644
--- a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py
+++ b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_EventHistory.py
@@ -2,7 +2,7 @@
import threading
from typing import List, Union
-from lldbsuite.test.tools.lldb_dap.dap_types import (
+from lldbsuite.test.tools.lldb_dap.types import (
CapabilitiesEvent,
DAPError,
Event,
@@ -14,7 +14,7 @@
ProgressEndEvent,
TerminatedEvent,
)
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
from lldbsuite.test.tools.lldb_dap.utils import EventHistory
diff --git a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py
index 2205e17d41c40..08d080cb4e49d 100644
--- a/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py
+++ b/lldb/test/API/tools/lldb-dap/utils/TestDAPUtils_Types.py
@@ -3,7 +3,7 @@
from dataclasses import dataclass, field
from typing import Dict, List, Literal, Optional, Tuple, Type, TypeVar, Union, cast
-from lldbsuite.test.tools.lldb_dap.dap_types import (
+from lldbsuite.test.tools.lldb_dap.types import (
EmptyBodyResponse,
Event,
EventName,
diff --git a/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py b/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
index 200e978c98a16..1615939b02364 100644
--- a/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
+++ b/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
@@ -13,13 +13,12 @@
skipUnlessDarwin,
)
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import (
+from lldbsuite.test.tools.lldb_dap.types import (
EvaluateContext,
LaunchArgs,
VariablesArgs,
)
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.session_helpers import ExpectEval, ExpectVar
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, ExpectEval, ExpectVar
def make_expected_buffer(start_idx, count, offset=0):
diff --git a/lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py b/lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py
index a993f815c056e..f37ccd6666915 100644
--- a/lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py
+++ b/lldb/test/API/tools/lldb-dap/variables/children/TestDAP_variables_children.py
@@ -1,8 +1,7 @@
from lldbsuite.test.decorators import expectedFailureAll
from lldbsuite.test.lldbtest import line_number
-from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
-from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
-from lldbsuite.test.tools.lldb_dap.session_helpers import ExpectVar
+from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
class TestDAP_variables_children(DAPTestCaseBase):
@@ -71,7 +70,7 @@ def test_return_variable_with_children(self):
verify_children = {"buffer": '"hello world!"', "x": "10", "y": "20"}
for child in result_children:
verify_value = verify_children.get(child.name)
- self.assertNotEqual(verify_value, None)
+ self.assertIsNotNone(verify_value)
self.assertEqual(
child.value, verify_value, "Expected child value does not match"
)
More information about the lldb-commits
mailing list