Skip to content

Commit b0a3c55

Browse files
tests/test_ifrename_dynamic: Merge duplicate code into a common function
Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
1 parent 4ed2dbc commit b0a3c55

2 files changed

Lines changed: 15 additions & 31 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ build-backend = "setuptools.build_meta"
107107
packages = ["xcp", "xcp.net", "xcp.net.ifrename"]
108108

109109
[tool.black]
110-
line-length = 96
110+
line-length = 92
111111

112112
[tool.mypy]
113113
pretty = true

tests/test_ifrename_dynamic.py

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@ def tearDown(self):
2424
self.logbuf.close()
2525

2626
def test_null(self):
27+
self.assertLoadDynamicRules("")
2728

28-
fd = StringIO("")
29-
dr = DynamicRules(fd=fd)
30-
29+
def loadDynamicRules(self, rules):
30+
dr = DynamicRules(fd=StringIO(rules))
3131
self.assertTrue(dr.load_and_parse())
32+
return dr
3233

34+
def assertLoadDynamicRules(self, rules):
35+
dr = self.loadDynamicRules(rules)
3336
self.assertEqual(dr.lastboot, [])
3437
self.assertEqual(dr.old, [])
3538

@@ -46,40 +49,21 @@ def test_empty(self):
4649
self.assertEqual(dr.old, [])
4750

4851
def test_one_invalid(self):
49-
50-
fd = StringIO(
51-
'{"lastboot":[["","",""]],"old":[]}'
52-
)
53-
dr = DynamicRules(fd=fd)
54-
55-
self.assertTrue(dr.load_and_parse())
56-
57-
self.assertEqual(dr.lastboot, [])
58-
self.assertEqual(dr.old, [])
52+
self.assertLoadDynamicRules('{"lastboot":[["","",""]],"old":[]}')
5953

6054
def test_one_valid_lastboot(self):
61-
62-
fd = StringIO(
55+
dr = self.loadDynamicRules(
6356
'{"lastboot":[["01:23:45:67:89:0a","00:10.2","eth2"]],"old":[]}'
64-
)
65-
dr = DynamicRules(fd=fd)
66-
67-
self.assertTrue(dr.load_and_parse())
68-
69-
self.assertEqual(dr.lastboot,
70-
[MACPCI("01:23:45:67:89:0a","00:10.2", tname="eth2")])
57+
)
58+
self.assertEqual(
59+
dr.lastboot, [MACPCI("01:23:45:67:89:0a", "00:10.2", tname="eth2")]
60+
)
7161
self.assertEqual(dr.old, [])
7262

73-
7463
def test_one_valid_lastboot2(self):
75-
76-
fd = StringIO(
64+
dr = self.loadDynamicRules(
7765
'{"lastboot":[],"old":[["01:23:45:67:89:0a","00:10.2","eth2"]]}'
78-
)
79-
dr = DynamicRules(fd=fd)
80-
81-
self.assertTrue(dr.load_and_parse())
82-
66+
)
8367
self.assertEqual(dr.lastboot, [])
8468
self.assertEqual(dr.old,
8569
[MACPCI("01:23:45:67:89:0a","00:10.2", tname="eth2")])

0 commit comments

Comments
 (0)