Skip to content

Commit 030aee6

Browse files
saikiran9392saikiran9392
committed
Changed the abstract columns and datalists from test cases of common and Identity
columns and datalist has been set in each test case in compute, which is not necessary. This patch abstract it out and remove all redundant code. Change-Id: I45a3582088161f12e60e7c933da8e7dcc0ae8e7b Closes-Bug: #1532384
1 parent a080227 commit 030aee6

19 files changed

Lines changed: 564 additions & 816 deletions

‎openstackclient/tests/common/test_configuration.py‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@
1818

1919
class TestConfiguration(utils.TestCommand):
2020

21+
columns = (
22+
'auth.password',
23+
'auth.token',
24+
'auth.username',
25+
'identity_api_version',
26+
'region',
27+
)
28+
datalist = (
29+
configuration.REDACTED,
30+
configuration.REDACTED,
31+
fakes.USERNAME,
32+
fakes.VERSION,
33+
fakes.REGION_NAME,
34+
)
35+
2136
def test_show(self):
2237
arglist = []
2338
verifylist = [('mask', True)]
@@ -26,17 +41,8 @@ def test_show(self):
2641

2742
columns, data = cmd.take_action(parsed_args)
2843

29-
collist = ('auth.password', 'auth.token', 'auth.username',
30-
'identity_api_version', 'region')
31-
self.assertEqual(collist, columns)
32-
datalist = (
33-
configuration.REDACTED,
34-
configuration.REDACTED,
35-
fakes.USERNAME,
36-
fakes.VERSION,
37-
fakes.REGION_NAME,
38-
)
39-
self.assertEqual(datalist, tuple(data))
44+
self.assertEqual(self.columns, columns)
45+
self.assertEqual(self.datalist, data)
4046

4147
def test_show_unmask(self):
4248
arglist = ['--unmask']
@@ -46,17 +52,15 @@ def test_show_unmask(self):
4652

4753
columns, data = cmd.take_action(parsed_args)
4854

49-
collist = ('auth.password', 'auth.token', 'auth.username',
50-
'identity_api_version', 'region')
51-
self.assertEqual(collist, columns)
55+
self.assertEqual(self.columns, columns)
5256
datalist = (
5357
fakes.PASSWORD,
5458
fakes.AUTH_TOKEN,
5559
fakes.USERNAME,
5660
fakes.VERSION,
5761
fakes.REGION_NAME,
5862
)
59-
self.assertEqual(datalist, tuple(data))
63+
self.assertEqual(datalist, data)
6064

6165
def test_show_mask(self):
6266
arglist = ['--mask']
@@ -66,14 +70,5 @@ def test_show_mask(self):
6670

6771
columns, data = cmd.take_action(parsed_args)
6872

69-
collist = ('auth.password', 'auth.token', 'auth.username',
70-
'identity_api_version', 'region')
71-
self.assertEqual(collist, columns)
72-
datalist = (
73-
configuration.REDACTED,
74-
configuration.REDACTED,
75-
fakes.USERNAME,
76-
fakes.VERSION,
77-
fakes.REGION_NAME,
78-
)
79-
self.assertEqual(datalist, tuple(data))
73+
self.assertEqual(self.columns, columns)
74+
self.assertEqual(self.datalist, data)

‎openstackclient/tests/common/test_extension.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ def setUp(self):
4242

4343
class TestExtensionList(TestExtension):
4444

45+
columns = ('Name', 'Alias', 'Description')
46+
4547
def setUp(self):
4648
super(TestExtensionList, self).setUp()
4749

@@ -67,8 +69,7 @@ def test_extension_list_no_options(self):
6769
# no args should output from all services
6870
self.identity_extensions_mock.list.assert_called_with()
6971

70-
collist = ('Name', 'Alias', 'Description')
71-
self.assertEqual(collist, columns)
72+
self.assertEqual(self.columns, columns)
7273
datalist = (
7374
(
7475
identity_fakes.extension_name,
@@ -135,8 +136,7 @@ def test_extension_list_identity(self):
135136

136137
self.identity_extensions_mock.list.assert_called_with()
137138

138-
collist = ('Name', 'Alias', 'Description')
139-
self.assertEqual(collist, columns)
139+
self.assertEqual(self.columns, columns)
140140
datalist = ((
141141
identity_fakes.extension_name,
142142
identity_fakes.extension_alias,
@@ -157,8 +157,7 @@ def test_extension_list_network(self):
157157

158158
self.network_extensions_mock.assert_called_with()
159159

160-
collist = ('Name', 'Alias', 'Description')
161-
self.assertEqual(collist, columns)
160+
self.assertEqual(self.columns, columns)
162161
datalist = (
163162
(
164163
network_fakes.extension_name,

‎openstackclient/tests/common/test_timing.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ def __init__(self, **kwargs):
3333

3434
class TestTiming(utils.TestCommand):
3535

36+
columns = (
37+
'URL',
38+
'Seconds',
39+
)
40+
3641
def setUp(self):
3742
super(TestTiming, self).setUp()
3843

@@ -59,8 +64,7 @@ def test_timing_list_no_data(self):
5964
# DisplayCommandBase.take_action() returns two tuples
6065
columns, data = self.cmd.take_action(parsed_args)
6166

62-
collist = ('URL', 'Seconds')
63-
self.assertEqual(collist, columns)
67+
self.assertEqual(self.columns, columns)
6468
datalist = [
6569
('Total', 0.0,)
6670
]
@@ -78,9 +82,7 @@ def test_timing_list(self):
7882

7983
# DisplayCommandBase.take_action() returns two tuples
8084
columns, data = self.cmd.take_action(parsed_args)
81-
82-
collist = ('URL', 'Seconds')
83-
self.assertEqual(collist, columns)
85+
self.assertEqual(self.columns, columns)
8486
datalist = [
8587
(timing_url, timing_elapsed),
8688
('Total', timing_elapsed),

‎openstackclient/tests/identity/v2_0/test_catalog.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ def setUp(self):
5555

5656
class TestCatalogList(TestCatalog):
5757

58+
columns = (
59+
'Name',
60+
'Type',
61+
'Endpoints',
62+
)
63+
5864
def setUp(self):
5965
super(TestCatalogList, self).setUp()
6066

@@ -70,8 +76,7 @@ def test_catalog_list(self):
7076
columns, data = self.cmd.take_action(parsed_args)
7177
self.sc_mock.service_catalog.get_data.assert_called_with()
7278

73-
collist = ('Name', 'Type', 'Endpoints')
74-
self.assertEqual(collist, columns)
79+
self.assertEqual(self.columns, columns)
7580
datalist = ((
7681
'supernova',
7782
'compute',
@@ -113,8 +118,7 @@ def test_catalog_list_with_endpoint_url(self):
113118
columns, data = self.cmd.take_action(parsed_args)
114119
self.sc_mock.service_catalog.get_data.assert_called_with()
115120

116-
collist = ('Name', 'Type', 'Endpoints')
117-
self.assertEqual(collist, columns)
121+
self.assertEqual(self.columns, columns)
118122
datalist = ((
119123
'supernova',
120124
'compute',

‎openstackclient/tests/identity/v2_0/test_project.py‎

Lines changed: 27 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,19 @@ def setUp(self):
3434

3535
class TestProjectCreate(TestProject):
3636

37+
columns = (
38+
'description',
39+
'enabled',
40+
'id',
41+
'name',
42+
)
43+
datalist = (
44+
identity_fakes.project_description,
45+
True,
46+
identity_fakes.project_id,
47+
identity_fakes.project_name,
48+
)
49+
3750
def setUp(self):
3851
super(TestProjectCreate, self).setUp()
3952

@@ -69,16 +82,8 @@ def test_project_create_no_options(self):
6982
identity_fakes.project_name,
7083
**kwargs
7184
)
72-
73-
collist = ('description', 'enabled', 'id', 'name')
74-
self.assertEqual(collist, columns)
75-
datalist = (
76-
identity_fakes.project_description,
77-
True,
78-
identity_fakes.project_id,
79-
identity_fakes.project_name,
80-
)
81-
self.assertEqual(datalist, data)
85+
self.assertEqual(self.columns, columns)
86+
self.assertEqual(self.datalist, data)
8287

8388
def test_project_create_description(self):
8489
arglist = [
@@ -104,15 +109,8 @@ def test_project_create_description(self):
104109
**kwargs
105110
)
106111

107-
collist = ('description', 'enabled', 'id', 'name')
108-
self.assertEqual(collist, columns)
109-
datalist = (
110-
identity_fakes.project_description,
111-
True,
112-
identity_fakes.project_id,
113-
identity_fakes.project_name,
114-
)
115-
self.assertEqual(datalist, data)
112+
self.assertEqual(self.columns, columns)
113+
self.assertEqual(self.datalist, data)
116114

117115
def test_project_create_enable(self):
118116
arglist = [
@@ -139,15 +137,8 @@ def test_project_create_enable(self):
139137
**kwargs
140138
)
141139

142-
collist = ('description', 'enabled', 'id', 'name')
143-
self.assertEqual(collist, columns)
144-
datalist = (
145-
identity_fakes.project_description,
146-
True,
147-
identity_fakes.project_id,
148-
identity_fakes.project_name,
149-
)
150-
self.assertEqual(datalist, data)
140+
self.assertEqual(self.columns, columns)
141+
self.assertEqual(self.datalist, data)
151142

152143
def test_project_create_disable(self):
153144
arglist = [
@@ -174,15 +165,8 @@ def test_project_create_disable(self):
174165
**kwargs
175166
)
176167

177-
collist = ('description', 'enabled', 'id', 'name')
178-
self.assertEqual(collist, columns)
179-
datalist = (
180-
identity_fakes.project_description,
181-
True,
182-
identity_fakes.project_id,
183-
identity_fakes.project_name,
184-
)
185-
self.assertEqual(datalist, data)
168+
self.assertEqual(self.columns, columns)
169+
self.assertEqual(self.datalist, data)
186170

187171
def test_project_create_property(self):
188172
arglist = [
@@ -211,15 +195,8 @@ def test_project_create_property(self):
211195
**kwargs
212196
)
213197

214-
collist = ('description', 'enabled', 'id', 'name')
215-
self.assertEqual(collist, columns)
216-
datalist = (
217-
identity_fakes.project_description,
218-
True,
219-
identity_fakes.project_id,
220-
identity_fakes.project_name,
221-
)
222-
self.assertEqual(datalist, data)
198+
self.assertEqual(self.columns, columns)
199+
self.assertEqual(self.datalist, data)
223200

224201
def test_project_create_or_show_exists(self):
225202
def _raise_conflict(*args, **kwargs):
@@ -260,15 +237,8 @@ def _raise_conflict(*args, **kwargs):
260237
**kwargs
261238
)
262239

263-
collist = ('description', 'enabled', 'id', 'name')
264-
self.assertEqual(collist, columns)
265-
datalist = (
266-
identity_fakes.project_description,
267-
True,
268-
identity_fakes.project_id,
269-
identity_fakes.project_name,
270-
)
271-
self.assertEqual(datalist, data)
240+
self.assertEqual(self.columns, columns)
241+
self.assertEqual(self.datalist, data)
272242

273243
def test_project_create_or_show_not_exists(self):
274244
arglist = [
@@ -294,15 +264,8 @@ def test_project_create_or_show_not_exists(self):
294264
**kwargs
295265
)
296266

297-
collist = ('description', 'enabled', 'id', 'name')
298-
self.assertEqual(collist, columns)
299-
datalist = (
300-
identity_fakes.project_description,
301-
True,
302-
identity_fakes.project_id,
303-
identity_fakes.project_name,
304-
)
305-
self.assertEqual(datalist, data)
267+
self.assertEqual(self.columns, columns)
268+
self.assertEqual(self.datalist, data)
306269

307270

308271
class TestProjectDelete(TestProject):

0 commit comments

Comments
 (0)