Skip to content

Commit ff91677

Browse files
authored
Merge pull request #6915 from apple/jdevlieghere/5.9/python-reformatting
[lldb] Reformat LLDB tests with black (NFC)
2 parents 048d241 + db2ede8 commit ff91677

File tree

1,411 files changed

+42499
-32617
lines changed

Some content is hidden

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

1,411 files changed

+42499
-32617
lines changed

lldb/test/API/android/platform/TestDefaultCacheLineSize.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"""
44

55

6-
76
import lldb
87
from lldbsuite.test.decorators import *
98
from lldbsuite.test.lldbtest import *
@@ -20,23 +19,17 @@ def test_cache_line_size(self):
2019
self.assertTrue(target and target.IsValid(), "Target is valid")
2120

2221
breakpoint = target.BreakpointCreateByName("main")
23-
self.assertTrue(
24-
breakpoint and breakpoint.IsValid(),
25-
"Breakpoint is valid")
22+
self.assertTrue(breakpoint and breakpoint.IsValid(), "Breakpoint is valid")
2623

2724
# Run the program.
28-
process = target.LaunchSimple(
29-
None, None, self.get_process_working_directory())
25+
process = target.LaunchSimple(None, None, self.get_process_working_directory())
3026
self.assertTrue(process and process.IsValid(), PROCESS_IS_VALID)
31-
self.assertEqual(
32-
process.GetState(),
33-
lldb.eStateStopped,
34-
PROCESS_STOPPED)
27+
self.assertEqual(process.GetState(), lldb.eStateStopped, PROCESS_STOPPED)
3528

3629
# check the setting value
3730
self.expect(
38-
"settings show target.process.memory-cache-line-size",
39-
patterns=[" = 2048"])
31+
"settings show target.process.memory-cache-line-size", patterns=[" = 2048"]
32+
)
4033

4134
# Run to completion.
4235
process.Continue()

lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class SBDirCheckerCase(TestBase):
1313

1414
def setUp(self):
1515
TestBase.setUp(self)
16-
self.source = 'main.cpp'
16+
self.source = "main.cpp"
1717
self.generateSource(self.source)
1818

1919
@skipIfNoSBHeaders
@@ -24,8 +24,7 @@ def test_sb_api_directory(self):
2424
if not (self.platformIsDarwin() and self.getArchitecture() == "x86_64"):
2525
self.skipTest("This test is only for LLDB.framework built 64-bit")
2626
if self.getArchitecture() == "i386":
27-
self.skipTest(
28-
"LLDB is 64-bit and cannot be linked to 32-bit test program.")
27+
self.skipTest("LLDB is 64-bit and cannot be linked to 32-bit test program.")
2928

3029
exe_name = self.getBuildArtifact("a.out")
3130
self.buildDriver(self.source, exe_name)
@@ -39,26 +38,33 @@ def sanity_check_executable(self, exe_name):
3938

4039
# This test uses a generated source file, so it's in the build directory.
4140
self.line_to_break = line_number(
42-
self.getBuildArtifact(self.source), '// Set breakpoint here.')
41+
self.getBuildArtifact(self.source), "// Set breakpoint here."
42+
)
4343

4444
env_cmd = "settings set target.env-vars %s=%s" % (
45-
self.dylibPath, self.getLLDBLibraryEnvVal())
45+
self.dylibPath,
46+
self.getLLDBLibraryEnvVal(),
47+
)
4648
if self.TraceOn():
4749
print("Set environment to: ", env_cmd)
4850
self.runCmd(env_cmd)
4951
self.addTearDownHook(
5052
lambda: self.dbg.HandleCommand(
51-
"settings remove target.env-vars %s" %
52-
self.dylibPath))
53+
"settings remove target.env-vars %s" % self.dylibPath
54+
)
55+
)
5356

5457
lldbutil.run_break_set_by_file_and_line(
55-
self, self.source, self.line_to_break, num_expected_locations=-1)
58+
self, self.source, self.line_to_break, num_expected_locations=-1
59+
)
5660

5761
self.runCmd("run", RUN_SUCCEEDED)
5862

5963
# The stop reason of the thread should be breakpoint.
60-
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
61-
substrs=['stopped',
62-
'stop reason = breakpoint'])
64+
self.expect(
65+
"thread list",
66+
STOPPED_DUE_TO_BREAKPOINT,
67+
substrs=["stopped", "stop reason = breakpoint"],
68+
)
6369

64-
self.runCmd('frame variable')
70+
self.runCmd("frame variable")

lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,24 @@ class TestSBCommandReturnObject(TestBase):
1010

1111
@skipIfNoSBHeaders
1212
@expectedFailureAll(
13-
oslist=["windows"], archs=["i[3-6]86", "x86_64"],
14-
bugnumber="llvm.org/pr43570")
13+
oslist=["windows"], archs=["i[3-6]86", "x86_64"], bugnumber="llvm.org/pr43570"
14+
)
1515
def test_sb_command_return_object(self):
1616
env = {self.dylibPath: self.getLLDBLibraryEnvVal()}
1717

1818
self.driver_exe = self.getBuildArtifact("command-return-object")
19-
self.buildDriver('main.cpp', self.driver_exe)
19+
self.buildDriver("main.cpp", self.driver_exe)
2020
self.addTearDownHook(lambda: os.remove(self.driver_exe))
2121
self.signBinary(self.driver_exe)
2222

2323
if self.TraceOn():
2424
print("Running test %s" % self.driver_exe)
2525
check_call([self.driver_exe, self.driver_exe], env=env)
2626
else:
27-
with open(os.devnull, 'w') as fnull:
28-
check_call([self.driver_exe, self.driver_exe],
29-
env=env, stdout=fnull, stderr=fnull)
27+
with open(os.devnull, "w") as fnull:
28+
check_call(
29+
[self.driver_exe, self.driver_exe],
30+
env=env,
31+
stdout=fnull,
32+
stderr=fnull,
33+
)

lldb/test/API/api/listeners/TestListener.py

Lines changed: 56 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
from lldbsuite.test.lldbtest import *
88
from lldbsuite.test import lldbutil
99

10-
class ListenToModuleLoadedEvents (TestBase):
10+
11+
class ListenToModuleLoadedEvents(TestBase):
1112
NO_DEBUG_INFO_TESTCASE = True
1213

1314
def test_clearing_listener(self):
@@ -21,15 +22,18 @@ def test_clearing_listener(self):
2122
my_listener.StartListeningForEventClass(
2223
self.dbg,
2324
lldb.SBTarget.GetBroadcasterClassName(),
24-
lldb.SBTarget.eBroadcastBitBreakpointChanged)
25+
lldb.SBTarget.eBroadcastBitBreakpointChanged,
26+
)
2527
my_first_listener.StartListeningForEventClass(
2628
self.dbg,
2729
lldb.SBTarget.GetBroadcasterClassName(),
28-
lldb.SBTarget.eBroadcastBitWatchpointChanged)
30+
lldb.SBTarget.eBroadcastBitWatchpointChanged,
31+
)
2932
my_third_listener.StartListeningForEventClass(
3033
self.dbg,
3134
lldb.SBTarget.GetBroadcasterClassName(),
32-
lldb.SBTarget.eBroadcastBitModulesUnloaded)
35+
lldb.SBTarget.eBroadcastBitModulesUnloaded,
36+
)
3337

3438
my_listener.Clear()
3539

@@ -39,8 +43,10 @@ def test_clearing_listener(self):
3943

4044
event = lldb.SBEvent()
4145
my_listener.WaitForEvent(1, event)
42-
self.assertTrue(not event.IsValid(), "We don't get events we aren't listening to.")
43-
46+
self.assertTrue(
47+
not event.IsValid(), "We don't get events we aren't listening to."
48+
)
49+
4450
def test_receiving_breakpoint_added_from_debugger(self):
4551
"""Test that we get breakpoint added events, waiting on event classes on the debugger"""
4652
self.build()
@@ -50,7 +56,8 @@ def test_receiving_breakpoint_added_from_debugger(self):
5056
my_listener.StartListeningForEventClass(
5157
self.dbg,
5258
lldb.SBTarget.GetBroadcasterClassName(),
53-
lldb.SBTarget.eBroadcastBitBreakpointChanged)
59+
lldb.SBTarget.eBroadcastBitBreakpointChanged,
60+
)
5461

5562
target = self.createTestTarget()
5663

@@ -61,26 +68,34 @@ def test_receiving_breakpoint_added_from_debugger(self):
6168

6269
self.assertTrue(event.IsValid(), "Got a valid event.")
6370
self.assertTrue(
64-
lldb.SBBreakpoint.EventIsBreakpointEvent(event),
65-
"It is a breakpoint event.")
66-
self.assertTrue(lldb.SBBreakpoint.GetBreakpointEventTypeFromEvent(
67-
event) == lldb.eBreakpointEventTypeAdded, "It is a breakpoint added event.")
71+
lldb.SBBreakpoint.EventIsBreakpointEvent(event), "It is a breakpoint event."
72+
)
73+
self.assertTrue(
74+
lldb.SBBreakpoint.GetBreakpointEventTypeFromEvent(event)
75+
== lldb.eBreakpointEventTypeAdded,
76+
"It is a breakpoint added event.",
77+
)
6878
self.assertEqual(
69-
bkpt, lldb.SBBreakpoint.GetBreakpointFromEvent(event),
70-
"It is our breakpoint.")
79+
bkpt,
80+
lldb.SBBreakpoint.GetBreakpointFromEvent(event),
81+
"It is our breakpoint.",
82+
)
7183

7284
# Now make sure if we stop listening for events we don't get them:
7385
my_listener.StopListeningForEventClass(
7486
self.dbg,
7587
lldb.SBTarget.GetBroadcasterClassName(),
76-
lldb.SBTarget.eBroadcastBitBreakpointChanged)
88+
lldb.SBTarget.eBroadcastBitBreakpointChanged,
89+
)
7790
my_listener.StopListeningForEvents(
78-
target.GetBroadcaster(),
79-
lldb.SBTarget.eBroadcastBitBreakpointChanged)
80-
91+
target.GetBroadcaster(), lldb.SBTarget.eBroadcastBitBreakpointChanged
92+
)
93+
8194
bkpt2 = target.BreakpointCreateByName("main")
8295
my_listener.WaitForEvent(1, event)
83-
self.assertTrue(not event.IsValid(), "We don't get events we aren't listening to.")
96+
self.assertTrue(
97+
not event.IsValid(), "We don't get events we aren't listening to."
98+
)
8499

85100
def test_recieving_breakpoint_added_from_target(self):
86101
"""Test that we get breakpoint added events, waiting on event classes on the debugger"""
@@ -90,12 +105,16 @@ def test_recieving_breakpoint_added_from_target(self):
90105
my_listener.StartListeningForEventClass(
91106
self.dbg,
92107
lldb.SBTarget.GetBroadcasterClassName(),
93-
lldb.SBTarget.eBroadcastBitBreakpointChanged)
108+
lldb.SBTarget.eBroadcastBitBreakpointChanged,
109+
)
94110

95111
target = self.createTestTarget()
96-
result = target.GetBroadcaster().AddListener(my_listener,
97-
lldb.SBTarget.eBroadcastBitBreakpointChanged)
98-
self.assertEqual(result, lldb.SBTarget.eBroadcastBitBreakpointChanged,"Got our bit")
112+
result = target.GetBroadcaster().AddListener(
113+
my_listener, lldb.SBTarget.eBroadcastBitBreakpointChanged
114+
)
115+
self.assertEqual(
116+
result, lldb.SBTarget.eBroadcastBitBreakpointChanged, "Got our bit"
117+
)
99118

100119
bkpt = target.BreakpointCreateByName("main")
101120

@@ -104,18 +123,24 @@ def test_recieving_breakpoint_added_from_target(self):
104123

105124
self.assertTrue(event.IsValid(), "Got a valid event.")
106125
self.assertTrue(
107-
lldb.SBBreakpoint.EventIsBreakpointEvent(event),
108-
"It is a breakpoint event.")
109-
self.assertTrue(lldb.SBBreakpoint.GetBreakpointEventTypeFromEvent(
110-
event) == lldb.eBreakpointEventTypeAdded, "It is a breakpoint added event.")
126+
lldb.SBBreakpoint.EventIsBreakpointEvent(event), "It is a breakpoint event."
127+
)
128+
self.assertTrue(
129+
lldb.SBBreakpoint.GetBreakpointEventTypeFromEvent(event)
130+
== lldb.eBreakpointEventTypeAdded,
131+
"It is a breakpoint added event.",
132+
)
111133
self.assertEqual(
112-
bkpt, lldb.SBBreakpoint.GetBreakpointFromEvent(event),
113-
"It is our breakpoint.")
134+
bkpt,
135+
lldb.SBBreakpoint.GetBreakpointFromEvent(event),
136+
"It is our breakpoint.",
137+
)
114138

115139
# Now make sure if we stop listening for events we don't get them:
116140
target.GetBroadcaster().RemoveListener(my_listener)
117-
141+
118142
bkpt2 = target.BreakpointCreateByName("main")
119143
my_listener.WaitForEvent(1, event)
120-
self.assertTrue(not event.IsValid(), "We don't get events we aren't listening to.")
121-
144+
self.assertTrue(
145+
not event.IsValid(), "We don't get events we aren't listening to."
146+
)

lldb/test/API/api/log/TestAPILog.py

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111

1212
class APILogTestCase(TestBase):
13-
1413
NO_DEBUG_INFO_TESTCASE = True
1514

1615
def test_api_log(self):
@@ -24,21 +23,35 @@ def test_api_log(self):
2423
target = self.dbg.CreateTarget(None)
2524

2625
self.assertTrue(os.path.isfile(logfile))
27-
with open(logfile, 'r') as f:
26+
with open(logfile, "r") as f:
2827
log = f.read()
2928

3029
# Find the SBDebugger's address.
3130
debugger_addr = re.findall(
32-
r"lldb::SBDebugger::GetScriptingLanguage\([^)]*\) \(0x([0-9a-fA-F]+),",
33-
log)
31+
r"lldb::SBDebugger::GetScriptingLanguage\([^)]*\) \(0x([0-9a-fA-F]+),", log
32+
)
3433

3534
# Make sure we've found a match.
3635
self.assertTrue(debugger_addr, log)
3736

3837
# Make sure the GetScriptingLanguage matches.
39-
self.assertTrue(re.search(r'lldb::SBDebugger::GetScriptingLanguage\([^)]*\) \(0x{}, ""\)'.format(
40-
debugger_addr[0]), log), log)
38+
self.assertTrue(
39+
re.search(
40+
r'lldb::SBDebugger::GetScriptingLanguage\([^)]*\) \(0x{}, ""\)'.format(
41+
debugger_addr[0]
42+
),
43+
log,
44+
),
45+
log,
46+
)
4147

4248
# Make sure the address matches.
43-
self.assertTrue(re.search(r'lldb::SBDebugger::CreateTarget\([^)]*\) \(0x{}, ""\)'.format(
44-
debugger_addr[0]), log), log)
49+
self.assertTrue(
50+
re.search(
51+
r'lldb::SBDebugger::CreateTarget\([^)]*\) \(0x{}, ""\)'.format(
52+
debugger_addr[0]
53+
),
54+
log,
55+
),
56+
log,
57+
)

lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010

1111
class TestMultipleSimultaneousDebuggers(TestBase):
12-
1312
NO_DEBUG_INFO_TESTCASE = True
1413

1514
@skipIfNoSBHeaders
@@ -18,17 +17,17 @@ def test_multiple_debuggers(self):
1817
env = {self.dylibPath: self.getLLDBLibraryEnvVal()}
1918

2019
# We need this in order to run under ASAN, in case only LLDB is ASANified.
21-
asan_options = os.getenv('ASAN_OPTIONS', None)
22-
if (asan_options is not None):
23-
env['ASAN_OPTIONS'] = asan_options
20+
asan_options = os.getenv("ASAN_OPTIONS", None)
21+
if asan_options is not None:
22+
env["ASAN_OPTIONS"] = asan_options
2423

2524
self.driver_exe = self.getBuildArtifact("multi-process-driver")
26-
self.buildDriver('multi-process-driver.cpp', self.driver_exe)
25+
self.buildDriver("multi-process-driver.cpp", self.driver_exe)
2726
self.addTearDownHook(lambda: os.remove(self.driver_exe))
2827
self.signBinary(self.driver_exe)
2928

3029
self.inferior_exe = self.getBuildArtifact("testprog")
31-
self.buildDriver('testprog.cpp', self.inferior_exe)
30+
self.buildDriver("testprog.cpp", self.inferior_exe)
3231
self.addTearDownHook(lambda: os.remove(self.inferior_exe))
3332

3433
# check_call will raise a CalledProcessError if multi-process-driver
@@ -39,6 +38,10 @@ def test_multiple_debuggers(self):
3938
print("Running test %s" % self.driver_exe)
4039
check_call([self.driver_exe, self.inferior_exe], env=env)
4140
else:
42-
with open(os.devnull, 'w') as fnull:
43-
check_call([self.driver_exe, self.inferior_exe],
44-
env=env, stdout=fnull, stderr=fnull)
41+
with open(os.devnull, "w") as fnull:
42+
check_call(
43+
[self.driver_exe, self.inferior_exe],
44+
env=env,
45+
stdout=fnull,
46+
stderr=fnull,
47+
)

0 commit comments

Comments
 (0)