Skip to content

Commit 604d858

Browse files
committed
Refactor: Abstract columns and datalist out in volume test cases
columns and datalist has been set in each test case in volume, which is not necessary. This patch abstract it out and remove all redundant code. Change-Id: I3a09d5d2db86da986bdcfbf2310978ced181017d
1 parent 030aee6 commit 604d858

7 files changed

Lines changed: 226 additions & 603 deletions

File tree

openstackclient/tests/volume/v1/test_qos_specs.py

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@ def test_qos_associate(self):
6969

7070

7171
class TestQosCreate(TestQos):
72+
73+
columns = (
74+
'consumer',
75+
'id',
76+
'name',
77+
)
78+
datalist = (
79+
volume_fakes.qos_consumer,
80+
volume_fakes.qos_id,
81+
volume_fakes.qos_name
82+
)
83+
7284
def setUp(self):
7385
super(TestQosCreate, self).setUp()
7486

@@ -97,12 +109,7 @@ def test_qos_create_without_properties(self):
97109
{'consumer': volume_fakes.qos_default_consumer}
98110
)
99111

100-
collist = (
101-
'consumer',
102-
'id',
103-
'name'
104-
)
105-
self.assertEqual(collist, columns)
112+
self.assertEqual(self.columns, columns)
106113
datalist = (
107114
volume_fakes.qos_default_consumer,
108115
volume_fakes.qos_id,
@@ -133,19 +140,8 @@ def test_qos_create_with_consumer(self):
133140
volume_fakes.qos_name,
134141
{'consumer': volume_fakes.qos_consumer}
135142
)
136-
137-
collist = (
138-
'consumer',
139-
'id',
140-
'name'
141-
)
142-
self.assertEqual(collist, columns)
143-
datalist = (
144-
volume_fakes.qos_consumer,
145-
volume_fakes.qos_id,
146-
volume_fakes.qos_name
147-
)
148-
self.assertEqual(datalist, data)
143+
self.assertEqual(self.columns, columns)
144+
self.assertEqual(self.datalist, data)
149145

150146
def test_qos_create_with_properties(self):
151147
self.qos_mock.create.return_value = fakes.FakeResource(
@@ -176,17 +172,11 @@ def test_qos_create_with_properties(self):
176172
specs
177173
)
178174

179-
collist = (
180-
'consumer',
181-
'id',
182-
'name',
175+
columns = self.columns + (
183176
'specs',
184177
)
185-
self.assertEqual(collist, columns)
186-
datalist = (
187-
volume_fakes.qos_consumer,
188-
volume_fakes.qos_id,
189-
volume_fakes.qos_name,
178+
self.assertEqual(columns, columns)
179+
datalist = self.datalist + (
190180
volume_fakes.qos_specs,
191181
)
192182
self.assertEqual(datalist, data)

0 commit comments

Comments
 (0)