Skip to content

Commit 84cf168

Browse files
committed
Refactor TestSetNetwork: Use TestNetwork in TestSetNetwork
Use TestNetwork in TestSetNetwork, and also setup test command in setUp(). Change-Id: I4e72332fcf253407bb3d5f20aaf4be047046e146 Related-to: blueprint neutron-client
1 parent 697df67 commit 84cf168

1 file changed

Lines changed: 24 additions & 25 deletions

File tree

openstackclient/tests/network/v2/test_network.py

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,21 @@ def test_network_list_long(self, network_list):
401401
self.assertEqual(self.data_long, list(data))
402402

403403

404-
class TestSetNetwork(common.TestNetworkBase):
404+
class TestSetNetwork(TestNetwork):
405+
406+
def setUp(self):
407+
super(TestSetNetwork, self).setUp()
408+
409+
self.network.update_network = mock.Mock(
410+
return_value=None
411+
)
412+
413+
self.network.list_networks = mock.Mock(
414+
return_value={RESOURCES: [copy.deepcopy(RECORD)]}
415+
)
416+
417+
self.cmd = network.SetNetwork(self.app, self.namespace)
418+
405419
def test_set_this(self):
406420
arglist = [
407421
FAKE_NAME,
@@ -415,18 +429,13 @@ def test_set_this(self):
415429
('name', 'noob'),
416430
('shared', True),
417431
]
418-
lister = mock.Mock(return_value={RESOURCES: [copy.deepcopy(RECORD)]})
419-
self.app.client_manager.network.list_networks = lister
420-
mocker = mock.Mock(return_value=None)
421-
self.app.client_manager.network.update_network = mocker
422-
cmd = network.SetNetwork(self.app, self.namespace)
423432

424-
parsed_args = self.check_parser(cmd, arglist, verifylist)
425-
result = cmd.take_action(parsed_args)
433+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
434+
result = self.cmd.take_action(parsed_args)
426435

427436
exp = {'admin_state_up': True, 'name': 'noob', 'shared': True}
428437
exp_record = {RESOURCE: exp}
429-
mocker.assert_called_with(FAKE_ID, exp_record)
438+
self.network.update_network.assert_called_with(FAKE_ID, exp_record)
430439
self.assertEqual(None, result)
431440

432441
def test_set_that(self):
@@ -440,31 +449,21 @@ def test_set_that(self):
440449
('admin_state', False),
441450
('shared', False),
442451
]
443-
lister = mock.Mock(return_value={RESOURCES: [copy.deepcopy(RECORD)]})
444-
self.app.client_manager.network.list_networks = lister
445-
mocker = mock.Mock(return_value=None)
446-
self.app.client_manager.network.update_network = mocker
447-
cmd = network.SetNetwork(self.app, self.namespace)
448452

449-
parsed_args = self.check_parser(cmd, arglist, verifylist)
450-
result = cmd.take_action(parsed_args)
453+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
454+
result = self.cmd.take_action(parsed_args)
451455

452456
exp = {'admin_state_up': False, 'shared': False}
453457
exp_record = {RESOURCE: exp}
454-
mocker.assert_called_with(FAKE_ID, exp_record)
458+
self.network.update_network.assert_called_with(FAKE_ID, exp_record)
455459
self.assertEqual(None, result)
456460

457461
def test_set_nothing(self):
458462
arglist = [FAKE_NAME, ]
459463
verifylist = [('identifier', FAKE_NAME), ]
460-
lister = mock.Mock(return_value={RESOURCES: [copy.deepcopy(RECORD)]})
461-
self.app.client_manager.network.list_networks = lister
462-
mocker = mock.Mock(return_value=None)
463-
self.app.client_manager.network.update_network = mocker
464-
cmd = network.SetNetwork(self.app, self.namespace)
465-
466-
parsed_args = self.check_parser(cmd, arglist, verifylist)
467-
self.assertRaises(exceptions.CommandError, cmd.take_action,
464+
465+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
466+
self.assertRaises(exceptions.CommandError, self.cmd.take_action,
468467
parsed_args)
469468

470469

0 commit comments

Comments
 (0)