Skip to content

Commit 7cededa

Browse files
ccie18643ccie18643
committed
code cleanup
1 parent 686e50e commit 7cededa

File tree

45 files changed

+1163
-1479
lines changed

Some content is hidden

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

45 files changed

+1163
-1479
lines changed

‎net_proto/tests/lib/testcase__packet_rx.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
"""
3434

3535

36-
from typing import Any
37-
3836
from testslide import TestCase
3937

4038
from net_proto import PacketRx
@@ -45,8 +43,7 @@ class TestCasePacketRx(TestCase):
4543
Customized TestCase class that provides PacketRx object.
4644
"""
4745

48-
_args: list[Any] = []
49-
_kwargs: dict[str, Any] = {}
46+
_frame_rx: bytes
5047

5148
_packet_rx: PacketRx
5249

@@ -55,4 +52,4 @@ def setUp(self) -> None:
5552
Set up the PacketRx object.
5653
"""
5754

58-
self._packet_rx = PacketRx(*self._args, **self._kwargs)
55+
self._packet_rx = PacketRx(self._frame_rx)

‎net_proto/tests/lib/testcase__packet_rx__ip4.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,23 @@ class TestCasePacketRxIp4(TestCase):
4848
IPv4 parser values.
4949
"""
5050

51-
_args: list[Any] = []
52-
_kwargs: dict[str, Any] = {}
51+
_frame_rx: bytes
5352
_mocked_values: dict[str, Any] = {}
53+
5454
_packet_rx: PacketRx
5555

5656
def setUp(self) -> None:
5757
"""
5858
Set up the mocked values for the IPv4 related fields.
5959
"""
6060

61-
self._packet_rx = PacketRx(*self._args, **self._kwargs)
61+
self._packet_rx = PacketRx(self._frame_rx)
6262

6363
self._packet_rx.ip = self._packet_rx.ip4 = cast(Ip4Parser, StrictMock(template=Ip4Parser))
6464
self.patch_attribute(
6565
target=self._packet_rx.ip4,
6666
attribute="payload_len",
67-
new_value=self._mocked_values.get("ip4__payload_len", len(self._args[0])),
67+
new_value=self._mocked_values.get("ip4__payload_len", len(self._frame_rx)),
6868
)
6969
self.patch_attribute(
7070
target=self._packet_rx.ip4,

‎net_proto/tests/lib/testcase__packet_rx__ip6.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,28 @@ class TestCasePacketRxIp6(TestCase):
4848
IPv6 parser values.
4949
"""
5050

51-
_args: list[Any] = []
52-
_kwargs: dict[str, Any] = {}
51+
_frame_rx: bytes
5352
_mocked_values: dict[str, Any] = {}
53+
5454
_packet_rx: PacketRx
5555

5656
def setUp(self) -> None:
5757
"""
5858
Set up the mocked values for the IPv6 related fields.
5959
"""
6060

61-
self._packet_rx = PacketRx(*self._args, **self._kwargs)
61+
self._packet_rx = PacketRx(self._frame_rx)
6262

6363
self._packet_rx.ip = self._packet_rx.ip6 = cast(Ip6Parser, StrictMock(template=Ip6Parser))
6464
self.patch_attribute(
6565
target=self._packet_rx.ip6,
6666
attribute="dlen",
67-
new_value=self._mocked_values.get("ip6__dlen", len(self._args[0])),
67+
new_value=self._mocked_values.get("ip6__dlen", len(self._frame_rx)),
6868
)
6969
self.patch_attribute(
7070
target=self._packet_rx.ip6,
7171
attribute="payload_len",
72-
new_value=self._mocked_values.get("ip6__dlen", len(self._args[0])),
72+
new_value=self._mocked_values.get("ip6__dlen", len(self._frame_rx)),
7373
)
7474
self.patch_attribute(
7575
target=self._packet_rx.ip6,

‎net_proto/tests/unit/protocols/arp/test__arp__assembler__operation.py‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
[
5757
{
5858
"_description": "ARP Request.",
59-
"_args": [],
6059
"_kwargs": {
6160
"arp__oper": ArpOperation.REQUEST,
6261
"arp__sha": MacAddress("01:02:03:04:05:06"),
@@ -67,7 +66,7 @@
6766
"_results": {
6867
"__len__": 28,
6968
"__str__": (
70-
"ARP Request 11.22.33.44 / 01:02:03:04:05:06 > " "101.102.103.104 / 0a:0b:0c:0d:0e:0f, len 28"
69+
"ARP Request 11.22.33.44 / 01:02:03:04:05:06 > 101.102.103.104 / 0a:0b:0c:0d:0e:0f, len 28"
7170
),
7271
"__repr__": (
7372
"ArpAssembler(header=ArpHeader(oper=<ArpOperation.REQUEST: 1>, "
@@ -110,7 +109,6 @@
110109
},
111110
{
112111
"_description": "ARP Reply.",
113-
"_args": [],
114112
"_kwargs": {
115113
"arp__oper": ArpOperation.REPLY,
116114
"arp__sha": MacAddress("a1:b2:c3:d4:e5:f6"),
@@ -120,7 +118,7 @@
120118
},
121119
"_results": {
122120
"__len__": 28,
123-
"__str__": ("ARP Reply 5.5.5.5 / a1:b2:c3:d4:e5:f6 > " "7.7.7.7 / 7a:7b:7c:7d:7e:7f, len 28"),
121+
"__str__": "ARP Reply 5.5.5.5 / a1:b2:c3:d4:e5:f6 > 7.7.7.7 / 7a:7b:7c:7d:7e:7f, len 28",
124122
"__repr__": (
125123
"ArpAssembler(header=ArpHeader(oper=<ArpOperation.REPLY: 2>, "
126124
"sha=MacAddress('a1:b2:c3:d4:e5:f6'), spa=Ip4Address('5.5.5.5'), "
@@ -168,7 +166,6 @@ class TestArpAssemblerPackets(TestCase):
168166
"""
169167

170168
_description: str
171-
_args: list[Any]
172169
_kwargs: dict[str, Any]
173170
_results: dict[str, Any]
174171

@@ -177,12 +174,11 @@ def setUp(self) -> None:
177174
Initialize the ARP packet assembler object with testcase arguments.
178175
"""
179176

180-
self._arp__assembler = ArpAssembler(*self._args, **self._kwargs)
177+
self._arp__assembler = ArpAssembler(**self._kwargs)
181178

182179
def test__arp__assembler__len(self) -> None:
183180
"""
184-
Ensure the ARP packet assembler '__len__()' method returns a correct
185-
value.
181+
Ensure the ARP packet assembler '__len__()' method returns a correct value.
186182
"""
187183

188184
self.assertEqual(
@@ -192,8 +188,7 @@ def test__arp__assembler__len(self) -> None:
192188

193189
def test__arp__assembler__str(self) -> None:
194190
"""
195-
Ensure the ARP packet assembler '__str__()' method returns a correct
196-
value.
191+
Ensure the ARP packet assembler '__str__()' method returns a correct value.
197192
"""
198193

199194
self.assertEqual(
@@ -203,8 +198,7 @@ def test__arp__assembler__str(self) -> None:
203198

204199
def test__arp__assembler__repr(self) -> None:
205200
"""
206-
Ensure the ARP packet assembler '__repr__()' method returns a correct
207-
value.
201+
Ensure the ARP packet assembler '__repr__()' method returns a correct value.
208202
"""
209203

210204
self.assertEqual(
@@ -214,8 +208,7 @@ def test__arp__assembler__repr(self) -> None:
214208

215209
def test__arp__assembler__bytes(self) -> None:
216210
"""
217-
Ensure the ARP packet assembler '__bytes__()' method returns a correct
218-
value.
211+
Ensure the ARP packet assembler '__bytes__()' method returns a correct value.
219212
"""
220213

221214
self.assertEqual(
@@ -225,8 +218,7 @@ def test__arp__assembler__bytes(self) -> None:
225218

226219
def test__arp__assembler__hrlen(self) -> None:
227220
"""
228-
Ensure the ARP packet assembler 'hrlen' property returns a correct
229-
value.
221+
Ensure the ARP packet assembler 'hrlen' property returns a correct value.
230222
"""
231223

232224
self.assertEqual(
@@ -236,8 +228,7 @@ def test__arp__assembler__hrlen(self) -> None:
236228

237229
def test__arp__assembler__prlen(self) -> None:
238230
"""
239-
Ensure the ARP packet assembler 'prlen' property returns a correct
240-
value.
231+
Ensure the ARP packet assembler 'prlen' property returns a correct value.
241232
"""
242233

243234
self.assertEqual(
@@ -247,8 +238,7 @@ def test__arp__assembler__prlen(self) -> None:
247238

248239
def test__arp__assembler__oper(self) -> None:
249240
"""
250-
Ensure the ARP packet assembler 'oper' property returns a correct
251-
value.
241+
Ensure the ARP packet assembler 'oper' property returns a correct value.
252242
"""
253243

254244
self.assertEqual(
@@ -258,8 +248,7 @@ def test__arp__assembler__oper(self) -> None:
258248

259249
def test__arp__assembler__sha(self) -> None:
260250
"""
261-
Ensure the ARP packet assembler 'sha' property returns a correct
262-
value.
251+
Ensure the ARP packet assembler 'sha' property returns a correct value.
263252
"""
264253

265254
self.assertEqual(
@@ -269,8 +258,7 @@ def test__arp__assembler__sha(self) -> None:
269258

270259
def test__arp__assembler__spa(self) -> None:
271260
"""
272-
Ensure the ARP packet assembler 'spa' property returns a correct
273-
value.
261+
Ensure the ARP packet assembler 'spa' property returns a correct value.
274262
"""
275263

276264
self.assertEqual(
@@ -280,8 +268,7 @@ def test__arp__assembler__spa(self) -> None:
280268

281269
def test__arp__assembler__tha(self) -> None:
282270
"""
283-
Ensure the ARP packet assembler 'tha' property returns a correct
284-
value.
271+
Ensure the ARP packet assembler 'tha' property returns a correct value.
285272
"""
286273

287274
self.assertEqual(
@@ -291,8 +278,7 @@ def test__arp__assembler__tha(self) -> None:
291278

292279
def test__arp__assembler__tpa(self) -> None:
293280
"""
294-
Ensure the ARP packet assembler 'tpa' property returns a correct
295-
value.
281+
Ensure the ARP packet assembler 'tpa' property returns a correct value.
296282
"""
297283

298284
self.assertEqual(
@@ -302,8 +288,7 @@ def test__arp__assembler__tpa(self) -> None:
302288

303289
def test__arp__assembler__header(self) -> None:
304290
"""
305-
Ensure the ARP packet assembler 'header' property returns a correct
306-
value.
291+
Ensure the ARP packet assembler 'header' property returns a correct value.
307292
"""
308293

309294
self.assertEqual(
@@ -315,8 +300,7 @@ def test__arp__assembler__assemble(
315300
self,
316301
) -> None:
317302
"""
318-
Ensure the Arp packet assembler 'assemble()' method returns
319-
a correct value.
303+
Ensure the Arp packet assembler 'assemble()' method returns a correct value.
320304
"""
321305

322306
buffers: list[Buffer] = []
@@ -336,8 +320,7 @@ class TestArpAssemblerMisc(TestCase):
336320

337321
def test__arp__assembler__echo_tracker(self) -> None:
338322
"""
339-
Ensure the ARP packet assembler 'tracker' property returns
340-
a correct value.
323+
Ensure the ARP packet assembler 'tracker' property returns a correct value.
341324
"""
342325

343326
echo_tracker = Tracker(prefix="RX")

‎net_proto/tests/unit/protocols/arp/test__arp__header__asserts.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def setUp(self) -> None:
5151
Create the default arguments for the ARP header constructor.
5252
"""
5353

54-
self._args: list[Any] = []
5554
self._kwargs: dict[str, Any] = {
5655
"oper": ArpOperation.REQUEST,
5756
"sha": MacAddress(),
@@ -62,14 +61,14 @@ def setUp(self) -> None:
6261

6362
def test__arp__header__oper__not_ArpOperation(self) -> None:
6463
"""
65-
Ensure the Arp header constructor raises an exception when the
66-
provided 'oper' argument is not a Dhcp4Operation.
64+
Ensure the Arp header constructor raises an exception when the provided
65+
'oper' argument is not a Dhcp4Operation.
6766
"""
6867

6968
self._kwargs["oper"] = value = "not a ArpOperation"
7069

7170
with self.assertRaises(AssertionError) as error:
72-
ArpHeader(*self._args, **self._kwargs)
71+
ArpHeader(**self._kwargs)
7372

7473
self.assertEqual(
7574
str(error.exception),
@@ -85,7 +84,7 @@ def test__arp__header__sha__not_MacAddress(self) -> None:
8584
self._kwargs["sha"] = value = "not a MacAddress"
8685

8786
with self.assertRaises(AssertionError) as error:
88-
ArpHeader(*self._args, **self._kwargs)
87+
ArpHeader(**self._kwargs)
8988

9089
self.assertEqual(
9190
str(error.exception),
@@ -95,13 +94,13 @@ def test__arp__header__sha__not_MacAddress(self) -> None:
9594
def test__arp__header__spa__not_Ip4Address(self) -> None:
9695
"""
9796
Ensure the ARP header constructor raises an exception when the provided
98-
'sha' argument is not an Ip4Address.
97+
'spa' argument is not an Ip4Address.
9998
"""
10099

101100
self._kwargs["spa"] = value = "not an Ip4Address"
102101

103102
with self.assertRaises(AssertionError) as error:
104-
ArpHeader(*self._args, **self._kwargs)
103+
ArpHeader(**self._kwargs)
105104

106105
self.assertEqual(
107106
str(error.exception),
@@ -117,7 +116,7 @@ def test__arp__header__tha__not_MacAddress(self) -> None:
117116
self._kwargs["tha"] = value = "not a MacAddress"
118117

119118
with self.assertRaises(AssertionError) as error:
120-
ArpHeader(*self._args, **self._kwargs)
119+
ArpHeader(**self._kwargs)
121120

122121
self.assertEqual(
123122
str(error.exception),
@@ -127,13 +126,13 @@ def test__arp__header__tha__not_MacAddress(self) -> None:
127126
def test__arp__header__tpa__not_Ip4Address(self) -> None:
128127
"""
129128
Ensure the ARP header constructor raises an exception when the provided
130-
'tha' argument is not a Ip4Address.
129+
'tpa' argument is not a Ip4Address.
131130
"""
132131

133132
self._kwargs["tpa"] = value = "not an Ip4Address"
134133

135134
with self.assertRaises(AssertionError) as error:
136-
ArpHeader(*self._args, **self._kwargs)
135+
ArpHeader(**self._kwargs)
137136

138137
self.assertEqual(
139138
str(error.exception),

0 commit comments

Comments
 (0)