Skip to content

Commit f9ca752

Browse files
committed
Refactor: Abstract columns out in TestFlavorList to avoid redundant code.
The columns has been set in each test case of TestFlavorList, which is not necessary. This patch abstract it out and remove all redundant code. Change-Id: Ideb2872f073755ac251bd603fd906410ea86c4ef Implements: blueprint improve-flavor-unit-tes
1 parent 8d52326 commit f9ca752

1 file changed

Lines changed: 20 additions & 53 deletions

File tree

openstackclient/tests/compute/v2/test_flavor.py

Lines changed: 20 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,21 @@ def setUp(self):
4747

4848
class TestFlavorList(TestFlavor):
4949

50+
columns = (
51+
'ID',
52+
'Name',
53+
'RAM',
54+
'Disk',
55+
'Ephemeral',
56+
'VCPUs',
57+
'Is Public',
58+
)
59+
columns_long = columns + (
60+
'Swap',
61+
'RXTX Factor',
62+
'Properties'
63+
)
64+
5065
def setUp(self):
5166
super(TestFlavorList, self).setUp()
5267

@@ -85,16 +100,7 @@ def test_flavor_list_no_options(self):
85100
**kwargs
86101
)
87102

88-
collist = (
89-
'ID',
90-
'Name',
91-
'RAM',
92-
'Disk',
93-
'Ephemeral',
94-
'VCPUs',
95-
'Is Public',
96-
)
97-
self.assertEqual(collist, columns)
103+
self.assertEqual(self.columns, columns)
98104
datalist = ((
99105
compute_fakes.flavor_id,
100106
compute_fakes.flavor_name,
@@ -130,16 +136,7 @@ def test_flavor_list_all_flavors(self):
130136
**kwargs
131137
)
132138

133-
collist = (
134-
'ID',
135-
'Name',
136-
'RAM',
137-
'Disk',
138-
'Ephemeral',
139-
'VCPUs',
140-
'Is Public',
141-
)
142-
self.assertEqual(collist, columns)
139+
self.assertEqual(self.columns, columns)
143140
datalist = ((
144141
compute_fakes.flavor_id,
145142
compute_fakes.flavor_name,
@@ -175,16 +172,7 @@ def test_flavor_list_private_flavors(self):
175172
**kwargs
176173
)
177174

178-
collist = (
179-
'ID',
180-
'Name',
181-
'RAM',
182-
'Disk',
183-
'Ephemeral',
184-
'VCPUs',
185-
'Is Public',
186-
)
187-
self.assertEqual(collist, columns)
175+
self.assertEqual(self.columns, columns)
188176
datalist = ((
189177
compute_fakes.flavor_id,
190178
compute_fakes.flavor_name,
@@ -220,16 +208,7 @@ def test_flavor_list_public_flavors(self):
220208
**kwargs
221209
)
222210

223-
collist = (
224-
'ID',
225-
'Name',
226-
'RAM',
227-
'Disk',
228-
'Ephemeral',
229-
'VCPUs',
230-
'Is Public',
231-
)
232-
self.assertEqual(collist, columns)
211+
self.assertEqual(self.columns, columns)
233212
datalist = ((
234213
compute_fakes.flavor_id,
235214
compute_fakes.flavor_name,
@@ -265,19 +244,7 @@ def test_flavor_list_long(self):
265244
**kwargs
266245
)
267246

268-
collist = (
269-
'ID',
270-
'Name',
271-
'RAM',
272-
'Disk',
273-
'Ephemeral',
274-
'VCPUs',
275-
'Is Public',
276-
'Swap',
277-
'RXTX Factor',
278-
'Properties'
279-
)
280-
self.assertEqual(collist, columns)
247+
self.assertEqual(self.columns_long, columns)
281248
datalist = ((
282249
compute_fakes.flavor_id,
283250
compute_fakes.flavor_name,

0 commit comments

Comments
 (0)