Skip to content

Commit f91685f

Browse files
Tang Chenstevemar
Tang Chen
authored and
stevemar
committed
Remove unnecessary type conversions in network unit tests
In some tests, when comparing the results data with the expected ones, many unnecessary type conversions are used. So remove them to clean up. Change-Id: I560ca78a3ab5e7b99087bfe1667de500f92c68de Partial-bug: #1550633
1 parent 461a203 commit f91685f

5 files changed

Lines changed: 52 additions & 46 deletions

File tree

‎openstackclient/tests/network/v2/test_network.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,8 @@ def test_show_all_options(self):
617617
self.network.find_network.assert_called_once_with(
618618
self._network.name, ignore_missing=False)
619619

620-
self.assertEqual(tuple(self.columns), columns)
621-
self.assertEqual(list(self.data), list(data))
620+
self.assertEqual(self.columns, columns)
621+
self.assertEqual(self.data, data)
622622

623623

624624
# Tests for Nova network
@@ -931,5 +931,5 @@ def test_show_all_options(self):
931931
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
932932
columns, data = self.cmd.take_action(parsed_args)
933933

934-
self.assertEqual(self.columns, tuple(columns))
934+
self.assertEqual(self.columns, columns)
935935
self.assertEqual(self.data, data)

‎openstackclient/tests/network/v2/test_router.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,5 +608,5 @@ def test_show_all_options(self):
608608

609609
self.network.find_router.assert_called_once_with(
610610
self._router.name, ignore_missing=False)
611-
self.assertEqual(tuple(self.columns), columns)
611+
self.assertEqual(self.columns, columns)
612612
self.assertEqual(self.data, data)

‎openstackclient/tests/network/v2/test_security_group.py‎

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def test_create_min_options(self):
114114
'description': self._security_group.name,
115115
'name': self._security_group.name,
116116
})
117-
self.assertEqual(tuple(self.columns), columns)
117+
self.assertEqual(self.columns, columns)
118118
self.assertEqual(self.data, data)
119119

120120
def test_create_all_options(self):
@@ -139,7 +139,7 @@ def test_create_all_options(self):
139139
'name': self._security_group.name,
140140
'tenant_id': identity_fakes.project_id,
141141
})
142-
self.assertEqual(tuple(self.columns), columns)
142+
self.assertEqual(self.columns, columns)
143143
self.assertEqual(self.data, data)
144144

145145

@@ -296,28 +296,30 @@ def test_security_group_delete(self):
296296
class TestListSecurityGroupNetwork(TestSecurityGroupNetwork):
297297

298298
# The security group to be listed.
299-
_security_group = \
300-
network_fakes.FakeSecurityGroup.create_one_security_group()
299+
_security_groups = \
300+
network_fakes.FakeSecurityGroup.create_security_groups(count=3)
301301

302-
expected_columns = (
302+
columns = (
303303
'ID',
304304
'Name',
305305
'Description',
306306
'Project',
307307
)
308308

309-
expected_data = ((
310-
_security_group.id,
311-
_security_group.name,
312-
_security_group.description,
313-
_security_group.tenant_id,
314-
),)
309+
data = []
310+
for grp in _security_groups:
311+
data.append((
312+
grp.id,
313+
grp.name,
314+
grp.description,
315+
grp.tenant_id,
316+
))
315317

316318
def setUp(self):
317319
super(TestListSecurityGroupNetwork, self).setUp()
318320

319321
self.network.security_groups = mock.Mock(
320-
return_value=[self._security_group])
322+
return_value=self._security_groups)
321323

322324
# Get the command object to test
323325
self.cmd = security_group.ListSecurityGroup(self.app, self.namespace)
@@ -332,8 +334,8 @@ def test_security_group_list_no_options(self):
332334
columns, data = self.cmd.take_action(parsed_args)
333335

334336
self.network.security_groups.assert_called_once_with()
335-
self.assertEqual(self.expected_columns, columns)
336-
self.assertEqual(self.expected_data, tuple(data))
337+
self.assertEqual(self.columns, columns)
338+
self.assertEqual(self.data, list(data))
337339

338340
def test_security_group_list_all_projects(self):
339341
arglist = [
@@ -347,45 +349,49 @@ def test_security_group_list_all_projects(self):
347349
columns, data = self.cmd.take_action(parsed_args)
348350

349351
self.network.security_groups.assert_called_once_with()
350-
self.assertEqual(self.expected_columns, columns)
351-
self.assertEqual(self.expected_data, tuple(data))
352+
self.assertEqual(self.columns, columns)
353+
self.assertEqual(self.data, list(data))
352354

353355

354356
class TestListSecurityGroupCompute(TestSecurityGroupCompute):
355357

356358
# The security group to be listed.
357-
_security_group = \
358-
compute_fakes.FakeSecurityGroup.create_one_security_group()
359+
_security_groups = \
360+
compute_fakes.FakeSecurityGroup.create_security_groups(count=3)
359361

360-
expected_columns = (
362+
columns = (
361363
'ID',
362364
'Name',
363365
'Description',
364366
)
365-
expected_columns_all_projects = (
367+
columns_all_projects = (
366368
'ID',
367369
'Name',
368370
'Description',
369371
'Project',
370372
)
371373

372-
expected_data = ((
373-
_security_group.id,
374-
_security_group.name,
375-
_security_group.description,
376-
),)
377-
expected_data_all_projects = ((
378-
_security_group.id,
379-
_security_group.name,
380-
_security_group.description,
381-
_security_group.tenant_id,
382-
),)
374+
data = []
375+
for grp in _security_groups:
376+
data.append((
377+
grp.id,
378+
grp.name,
379+
grp.description,
380+
))
381+
data_all_projects = []
382+
for grp in _security_groups:
383+
data_all_projects.append((
384+
grp.id,
385+
grp.name,
386+
grp.description,
387+
grp.tenant_id,
388+
))
383389

384390
def setUp(self):
385391
super(TestListSecurityGroupCompute, self).setUp()
386392

387393
self.app.client_manager.network_endpoint_enabled = False
388-
self.compute.security_groups.list.return_value = [self._security_group]
394+
self.compute.security_groups.list.return_value = self._security_groups
389395

390396
# Get the command object to test
391397
self.cmd = security_group.ListSecurityGroup(self.app, None)
@@ -401,8 +407,8 @@ def test_security_group_list_no_options(self):
401407

402408
kwargs = {'search_opts': {'all_tenants': False}}
403409
self.compute.security_groups.list.assert_called_once_with(**kwargs)
404-
self.assertEqual(self.expected_columns, columns)
405-
self.assertEqual(self.expected_data, tuple(data))
410+
self.assertEqual(self.columns, columns)
411+
self.assertEqual(self.data, list(data))
406412

407413
def test_security_group_list_all_projects(self):
408414
arglist = [
@@ -417,8 +423,8 @@ def test_security_group_list_all_projects(self):
417423

418424
kwargs = {'search_opts': {'all_tenants': True}}
419425
self.compute.security_groups.list.assert_called_once_with(**kwargs)
420-
self.assertEqual(self.expected_columns_all_projects, columns)
421-
self.assertEqual(self.expected_data_all_projects, tuple(data))
426+
self.assertEqual(self.columns_all_projects, columns)
427+
self.assertEqual(self.data_all_projects, list(data))
422428

423429

424430
class TestSetSecurityGroupNetwork(TestSecurityGroupNetwork):

‎openstackclient/tests/network/v2/test_security_group_rule.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def test_create_default_rule(self):
174174
'remote_ip_prefix': self._security_group_rule.remote_ip_prefix,
175175
'security_group_id': self._security_group.id,
176176
})
177-
self.assertEqual(tuple(self.expected_columns), columns)
177+
self.assertEqual(self.expected_columns, columns)
178178
self.assertEqual(self.expected_data, data)
179179

180180
def test_create_source_group(self):
@@ -209,7 +209,7 @@ def test_create_source_group(self):
209209
'remote_group_id': self._security_group_rule.remote_group_id,
210210
'security_group_id': self._security_group.id,
211211
})
212-
self.assertEqual(tuple(self.expected_columns), columns)
212+
self.assertEqual(self.expected_columns, columns)
213213
self.assertEqual(self.expected_data, data)
214214

215215
def test_create_source_ip(self):
@@ -240,7 +240,7 @@ def test_create_source_ip(self):
240240
'remote_ip_prefix': self._security_group_rule.remote_ip_prefix,
241241
'security_group_id': self._security_group.id,
242242
})
243-
self.assertEqual(tuple(self.expected_columns), columns)
243+
self.assertEqual(self.expected_columns, columns)
244244
self.assertEqual(self.expected_data, data)
245245

246246
def test_create_network_options(self):
@@ -282,7 +282,7 @@ def test_create_network_options(self):
282282
'security_group_id': self._security_group.id,
283283
'tenant_id': identity_fakes.project_id,
284284
})
285-
self.assertEqual(tuple(self.expected_columns), columns)
285+
self.assertEqual(self.expected_columns, columns)
286286
self.assertEqual(self.expected_data, data)
287287

288288

@@ -816,7 +816,7 @@ def test_show_all_options(self):
816816

817817
self.network.find_security_group_rule.assert_called_once_with(
818818
self._security_group_rule.id, ignore_missing=False)
819-
self.assertEqual(tuple(self.columns), columns)
819+
self.assertEqual(self.columns, columns)
820820
self.assertEqual(self.data, data)
821821

822822

‎openstackclient/tests/network/v2/test_subnet.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,4 +627,4 @@ def test_show_all_options(self):
627627
self._subnet.name, ignore_missing=False)
628628

629629
self.assertEqual(self.columns, columns)
630-
self.assertEqual(list(self.data), list(data))
630+
self.assertEqual(self.data, data)

0 commit comments

Comments
 (0)