Skip to content

Commit f19ff68

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

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
@@ -62,6 +62,21 @@ class TestFlavorList(TestFlavor):
6262
'Properties'
6363
)
6464

65+
data = ((
66+
compute_fakes.flavor_id,
67+
compute_fakes.flavor_name,
68+
compute_fakes.flavor_ram,
69+
'',
70+
'',
71+
compute_fakes.flavor_vcpus,
72+
''
73+
), )
74+
data_long = (data[0] + (
75+
'',
76+
'',
77+
'property=\'value\''
78+
), )
79+
6580
def setUp(self):
6681
super(TestFlavorList, self).setUp()
6782

@@ -101,16 +116,7 @@ def test_flavor_list_no_options(self):
101116
)
102117

103118
self.assertEqual(self.columns, columns)
104-
datalist = ((
105-
compute_fakes.flavor_id,
106-
compute_fakes.flavor_name,
107-
compute_fakes.flavor_ram,
108-
'',
109-
'',
110-
compute_fakes.flavor_vcpus,
111-
''
112-
), )
113-
self.assertEqual(datalist, tuple(data))
119+
self.assertEqual(tuple(self.data), tuple(data))
114120

115121
def test_flavor_list_all_flavors(self):
116122
arglist = [
@@ -137,16 +143,7 @@ def test_flavor_list_all_flavors(self):
137143
)
138144

139145
self.assertEqual(self.columns, columns)
140-
datalist = ((
141-
compute_fakes.flavor_id,
142-
compute_fakes.flavor_name,
143-
compute_fakes.flavor_ram,
144-
'',
145-
'',
146-
compute_fakes.flavor_vcpus,
147-
''
148-
), )
149-
self.assertEqual(datalist, tuple(data))
146+
self.assertEqual(tuple(self.data), tuple(data))
150147

151148
def test_flavor_list_private_flavors(self):
152149
arglist = [
@@ -173,16 +170,7 @@ def test_flavor_list_private_flavors(self):
173170
)
174171

175172
self.assertEqual(self.columns, columns)
176-
datalist = ((
177-
compute_fakes.flavor_id,
178-
compute_fakes.flavor_name,
179-
compute_fakes.flavor_ram,
180-
'',
181-
'',
182-
compute_fakes.flavor_vcpus,
183-
''
184-
), )
185-
self.assertEqual(datalist, tuple(data))
173+
self.assertEqual(tuple(self.data), tuple(data))
186174

187175
def test_flavor_list_public_flavors(self):
188176
arglist = [
@@ -209,16 +197,7 @@ def test_flavor_list_public_flavors(self):
209197
)
210198

211199
self.assertEqual(self.columns, columns)
212-
datalist = ((
213-
compute_fakes.flavor_id,
214-
compute_fakes.flavor_name,
215-
compute_fakes.flavor_ram,
216-
'',
217-
'',
218-
compute_fakes.flavor_vcpus,
219-
''
220-
), )
221-
self.assertEqual(datalist, tuple(data))
200+
self.assertEqual(tuple(self.data), tuple(data))
222201

223202
def test_flavor_list_long(self):
224203
arglist = [
@@ -245,19 +224,7 @@ def test_flavor_list_long(self):
245224
)
246225

247226
self.assertEqual(self.columns_long, columns)
248-
datalist = ((
249-
compute_fakes.flavor_id,
250-
compute_fakes.flavor_name,
251-
compute_fakes.flavor_ram,
252-
'',
253-
'',
254-
compute_fakes.flavor_vcpus,
255-
'',
256-
'',
257-
'',
258-
'property=\'value\''
259-
), )
260-
self.assertEqual(datalist, tuple(data))
227+
self.assertEqual(tuple(self.data_long), tuple(data))
261228

262229

263230
class TestFlavorSet(TestFlavor):

0 commit comments

Comments
 (0)