Skip to content

Commit eeb8527

Browse files
dsandersllvmdsandersllvm
committed
[lldb] Renamed assertPacketLogContains to assertPacketLogReceived
The docstring is currently wrong about the packet log containing both sent and received packets. This will be corrected in the next commit at which point this function will be filtering to the received packets for compatibility
1 parent 43bc2f3 commit eeb8527

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎lldb/packages/Python/lldbsuite/test/lldbgdbclient.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class GDBRemoteTestBase(TestBase):
1010
Base class for GDB client tests.
1111
1212
This class will setup and start a mock GDB server for the test to use.
13-
It also provides assertPacketLogContains, which simplifies the checking
13+
It also provides assertPacketLogReceived, which simplifies the checking
1414
of packets sent by the client.
1515
"""
1616

@@ -60,12 +60,12 @@ def connect(self, target, plugin="gdb-remote"):
6060
self.assertTrue(process, PROCESS_IS_VALID)
6161
return process
6262

63-
def assertPacketLogContains(self, packets, log=None):
63+
def assertPacketLogReceived(self, packets, log=None):
6464
"""
65-
Assert that the mock server's packet log contains the given packets.
65+
Assert that the mock server's packet log received the given packets.
6666
6767
The packet log includes all packets sent by the client and received
68-
by the server. This fuction makes it easy to verify that the client
68+
by the server. This function makes it easy to verify that the client
6969
sent the expected packets to the server.
7070
7171
The check does not require that the packets be consecutive, but does

‎lldb/test/API/functionalities/gdb_remote_client/TestContinue.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def qfThreadInfo(self):
4141
lldbutil.expect_state_changes(
4242
self, self.dbg.GetListener(), process, [lldb.eStateExited]
4343
)
44-
self.assertPacketLogContains(["vCont;C13:401"])
44+
self.assertPacketLogReceived(["vCont;C13:401"])
4545

4646
def test_continue_no_vCont(self):
4747
class MyResponder(self.BaseResponder):
@@ -61,7 +61,7 @@ def other(self, packet):
6161
lldbutil.expect_state_changes(
6262
self, self.dbg.GetListener(), process, [lldb.eStateExited]
6363
)
64-
self.assertPacketLogContains(["Hc401", "C13"])
64+
self.assertPacketLogReceived(["Hc401", "C13"])
6565

6666
def test_continue_multiprocess(self):
6767
class MyResponder(self.BaseResponder):
@@ -74,4 +74,4 @@ class MyResponder(self.BaseResponder):
7474
lldbutil.expect_state_changes(
7575
self, self.dbg.GetListener(), process, [lldb.eStateExited]
7676
)
77-
self.assertPacketLogContains(["vCont;C13:p400.401"])
77+
self.assertPacketLogReceived(["vCont;C13:p400.401"])

‎lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteClient.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test_connect(self):
3636
"""Test connecting to a remote gdb server"""
3737
target = self.createTarget("a.yaml")
3838
process = self.connect(target)
39-
self.assertPacketLogContains(["qProcessInfo", "qfThreadInfo"])
39+
self.assertPacketLogReceived(["qProcessInfo", "qfThreadInfo"])
4040

4141
def test_attach_fail(self):
4242
error_msg = "mock-error-msg"
@@ -291,7 +291,7 @@ def qLaunchSuccess(self):
291291
self.assertTrue(process, PROCESS_IS_VALID)
292292
self.assertEqual(process.GetProcessID(), 16)
293293

294-
self.assertPacketLogContains(
294+
self.assertPacketLogReceived(
295295
[
296296
"A%d,0,%s,8,1,61726731,8,2,61726732,8,3,61726733"
297297
% (len(exe_hex), exe_hex),
@@ -352,7 +352,7 @@ def A(self, packet):
352352
self.assertTrue(process, PROCESS_IS_VALID)
353353
self.assertEqual(process.GetProcessID(), 16)
354354

355-
self.assertPacketLogContains(
355+
self.assertPacketLogReceived(
356356
["vRun;%s;61726731;61726732;61726733" % (exe_hex,)]
357357
)
358358

@@ -424,7 +424,7 @@ def A(self, packet):
424424
self.assertTrue(process, PROCESS_IS_VALID)
425425
self.assertEqual(process.GetProcessID(), 16)
426426

427-
self.assertPacketLogContains(
427+
self.assertPacketLogReceived(
428428
["vRun;%s;61726731;61726732;61726733" % (exe_hex,)]
429429
)
430430

@@ -468,7 +468,7 @@ def vRun(self, packet):
468468
lldb.SBError(),
469469
) # error
470470

471-
self.assertPacketLogContains(
471+
self.assertPacketLogReceived(
472472
[
473473
"QEnvironment:EQUALS=foo=bar",
474474
"QEnvironmentHexEncoded:4e45454453454e433d66726f6224",
@@ -522,7 +522,7 @@ def QEnvironment(self, packet):
522522
lldb.SBError(),
523523
) # error
524524

525-
self.assertPacketLogContains(
525+
self.assertPacketLogReceived(
526526
[
527527
"QEnvironmentHexEncoded:455155414c533d666f6f3d626172",
528528
"QEnvironmentHexEncoded:4e45454453454e433d66726f6224",

‎lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteLoad.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_ram_load(self):
2222
target = self.createTarget("a.yaml")
2323
process = self.connect(target)
2424
self.dbg.HandleCommand("target modules load -l -s0")
25-
self.assertPacketLogContains(["M1000,4:c3c3c3c3", "M1004,2:3232"])
25+
self.assertPacketLogReceived(["M1000,4:c3c3c3c3", "M1004,2:3232"])
2626

2727
@skipIfXmlSupportMissing
2828
def test_flash_load(self):
@@ -63,7 +63,7 @@ def other(self, packet):
6363
target = self.createTarget("a.yaml")
6464
process = self.connect(target)
6565
self.dbg.HandleCommand("target modules load -l -s0")
66-
self.assertPacketLogContains(
66+
self.assertPacketLogReceived(
6767
[
6868
"vFlashErase:1000,100",
6969
"vFlashWrite:1000:\xc3\xc3\xc3\xc3",

‎lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def vFile(self, packet):
3030
)
3131
self.match("platform file write 16 -o 11 -d teststring", [r"Return = 10"])
3232
self.match("platform file close 16", [r"file 16 closed."])
33-
self.assertPacketLogContains(
33+
self.assertPacketLogReceived(
3434
[
3535
"vFile:open:2f736f6d652f66696c652e747874,00000202,000001ed",
3636
"vFile:pread:10,d,b",
@@ -66,7 +66,7 @@ def vFile(self, packet):
6666
error=True,
6767
)
6868
self.match("platform file close 16", [enosys_regex], error=True)
69-
self.assertPacketLogContains(
69+
self.assertPacketLogReceived(
7070
[
7171
"vFile:open:2f736f6d652f66696c652e747874,00000202,000001ed",
7272
"vFile:pread:10,d,b",
@@ -88,7 +88,7 @@ def vFile(self, packet):
8888
"platform get-size /some/file.txt",
8989
[r"File size of /some/file\.txt \(remote\): 4096"],
9090
)
91-
self.assertPacketLogContains(
91+
self.assertPacketLogReceived(
9292
[
9393
"vFile:size:2f736f6d652f66696c652e747874",
9494
]
@@ -113,7 +113,7 @@ def vFile(self, packet):
113113
"platform get-size /some/file.txt",
114114
[r"File size of /some/file\.txt \(remote\): 66051"],
115115
)
116-
self.assertPacketLogContains(
116+
self.assertPacketLogReceived(
117117
[
118118
"vFile:size:2f736f6d652f66696c652e747874",
119119
"vFile:open:2f736f6d652f66696c652e747874,00000000,00000000",
@@ -135,7 +135,7 @@ def vFile(self, packet):
135135
[r"File size of /other/file\.txt \(remote\): 66051"],
136136
)
137137

138-
self.assertPacketLogContains(
138+
self.assertPacketLogReceived(
139139
[
140140
"vFile:size:2f6f746865722f66696c652e747874",
141141
"vFile:open:2f6f746865722f66696c652e747874,00000000,00000000",
@@ -161,7 +161,7 @@ def vFile(self, packet):
161161
"platform get-permissions /some/file.txt",
162162
[r"File permissions of /some/file\.txt \(remote\): 0o0644"],
163163
)
164-
self.assertPacketLogContains(
164+
self.assertPacketLogReceived(
165165
[
166166
"vFile:mode:2f736f6d652f66696c652e747874",
167167
]
@@ -190,7 +190,7 @@ def vFile(self, packet):
190190
"platform get-permissions /some/file.txt",
191191
[r"File permissions of /some/file\.txt \(remote\): 0o0644"],
192192
)
193-
self.assertPacketLogContains(
193+
self.assertPacketLogReceived(
194194
[
195195
"vFile:mode:2f736f6d652f66696c652e747874",
196196
"vFile:open:2f736f6d652f66696c652e747874,00000000,00000000",
@@ -214,7 +214,7 @@ def vFile(self, packet):
214214
"platform file-exists /some/file.txt",
215215
[r"File /some/file\.txt \(remote\) exists"],
216216
)
217-
self.assertPacketLogContains(
217+
self.assertPacketLogReceived(
218218
[
219219
"vFile:exists:2f736f6d652f66696c652e747874",
220220
]
@@ -233,7 +233,7 @@ def vFile(self, packet):
233233
"platform file-exists /some/file.txt",
234234
[r"File /some/file\.txt \(remote\) does not exist"],
235235
)
236-
self.assertPacketLogContains(
236+
self.assertPacketLogReceived(
237237
[
238238
"vFile:exists:2f736f6d652f66696c652e747874",
239239
]
@@ -256,7 +256,7 @@ def vFile(self, packet):
256256
"platform file-exists /some/file.txt",
257257
[r"File /some/file\.txt \(remote\) exists"],
258258
)
259-
self.assertPacketLogContains(
259+
self.assertPacketLogReceived(
260260
[
261261
"vFile:exists:2f736f6d652f66696c652e747874",
262262
"vFile:open:2f736f6d652f66696c652e747874,00000000,00000000",
@@ -279,7 +279,7 @@ def vFile(self, packet):
279279
"platform file-exists /some/file.txt",
280280
[r"File /some/file\.txt \(remote\) does not exist"],
281281
)
282-
self.assertPacketLogContains(
282+
self.assertPacketLogReceived(
283283
[
284284
"vFile:exists:2f736f6d652f66696c652e747874",
285285
"vFile:open:2f736f6d652f66696c652e747874,00000000,00000000",

0 commit comments

Comments
 (0)