Skip to content

Commit 67ddae2

Browse files
committed
[lldb-dap][NFC] Use wildcard imports for test decorators (llvm#216235)
Replace explicit imports `from ... import (a, b, c)` with wildcard imports `from ... import *` for `lldbsuite.test.decorators`, This lets downstream forks introduce extra decorators (e.g. to skip tests on private configurations) without needing to patch each test's import list. [Related discourse](https://discourse.llvm.org/t/do-we-want-to-tighten-up-imports-in-the-api-testcases/91557/3) (cherry picked from commit 3b7142c)
1 parent 1a40aac commit 67ddae2

63 files changed

Lines changed: 70 additions & 145 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

lldb/test/API/tools/lldb-dap/attach-commands/TestDAP_attachCommands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Test lldb-dap attach commands
33
"""
44

5-
from lldbsuite.test.decorators import skipIfNetBSD, skipIfWasm
5+
from lldbsuite.test.decorators import *
66
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
77
from lldbsuite.test.tools.lldb_dap.types import AttachArgs, PauseArgs
88

lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
from pathlib import Path
88

99
from lldbsuite.test import lldbutil
10-
from lldbsuite.test.decorators import (
11-
expectedFailureWindows,
12-
expectedFailureWindowsAndNoLLDBServer,
13-
requireNotWasm,
14-
skipIf,
15-
skipIfWindowsAndLLDBServer,
16-
)
10+
from lldbsuite.test.decorators import *
1711
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
1812
from lldbsuite.test.tools.lldb_dap.types import (
1913
AttachArgs,

lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from lldbgdbserverutils import Pipe
88
from lldbsuite.test import lldbplatformutil
9-
from lldbsuite.test.decorators import skipIfNetBSD, skipIfWasm, skipIfWindows
9+
from lldbsuite.test.decorators import *
1010
from lldbsuite.test.lldbtest import line_number
1111
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
1212
from lldbsuite.test.tools.lldb_dap.types import AttachArgs

lldb/test/API/tools/lldb-dap/breakpoint-assembly/TestDAP_breakpointAssembly.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Test lldb-dap setBreakpoints request in assembly source references.
33
"""
44

5-
from lldbsuite.test.decorators import skipIfWindows
5+
from lldbsuite.test.decorators import *
66
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
77
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
88

lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
import os
66
from typing import List
77

8-
from lldbsuite.test.decorators import (
9-
skipIfTargetDoesNotSupportSharedLibraries,
10-
skipIfWindows,
11-
)
8+
from lldbsuite.test.decorators import *
129
from lldbsuite.test.lldbtest import line_number
1310
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
1411
from lldbsuite.test.tools.lldb_dap.types import (

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44

55
import os
66

7-
from lldbsuite.test.decorators import (
8-
skipIfTargetDoesNotSupportSharedLibraries,
9-
skipIfWindows,
10-
)
7+
from lldbsuite.test.decorators import *
118
from lldbsuite.test.lldbtest import line_number
129
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
1310
from lldbsuite.test.tools.lldb_dap.types import BreakpointLocation, LaunchArgs

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44

55
import os
66

7-
from lldbsuite.test.decorators import (
8-
skipIfTargetDoesNotSupportSharedLibraries,
9-
skipIfWindows,
10-
)
7+
from lldbsuite.test.decorators import *
118
from lldbsuite.test.lldbtest import line_number
129
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase, DAPTestSession
1310
from lldbsuite.test.tools.lldb_dap.types import (
@@ -16,7 +13,6 @@
1613
StoppedEvent,
1714
)
1815

19-
2016
@skipIfTargetDoesNotSupportSharedLibraries()
2117
class TestDAP_logpoints(DAPTestCaseBase):
2218
def setUp(self):

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
import shutil
77
from typing import Dict
88

9-
from lldbsuite.test.decorators import (
10-
skipIfTargetDoesNotSupportSharedLibraries,
11-
skipIfWasm,
12-
skipIfWindows,
13-
)
9+
from lldbsuite.test.decorators import *
1410
from lldbsuite.test.lldbtest import line_number
1511
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
1612
from lldbsuite.test.tools.lldb_dap.types import (

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
Test lldb-dap setExceptionBreakpoints request
33
"""
44

5-
from lldbsuite.test.decorators import (
6-
skipIfTargetDoesNotSupportSharedLibraries,
7-
skipIfWindows,
8-
)
5+
from lldbsuite.test.decorators import *
96
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
107
from lldbsuite.test.tools.lldb_dap.types import LaunchArgs
118

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
Test lldb-dap setFunctionBreakpoints request
33
"""
44

5-
from lldbsuite.test.decorators import (
6-
skipIfTargetDoesNotSupportSharedLibraries,
7-
skipIfWindows,
8-
)
5+
from lldbsuite.test.decorators import *
96
from lldbsuite.test.tools.lldb_dap import DAPTestCaseBase
107
from lldbsuite.test.tools.lldb_dap.types import (
118
DAPTestGetTargetBreakpointsArgs,

0 commit comments

Comments
 (0)