openstack/deb-python-openstackclient
Code Issues Proposed changes

Merge "Refactor TestSetNetwork: Use TestNetwork in TestSetNetwork"

Browse Source
This commit is contained in:
Jenkins
2015-12-06 03:52:30 +00:00
committed by Gerrit Code Review
parent 19d9ccb97a 84cf168d1c
commit 57c4385ef3
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
openstackclient/tests/network/v2/test_network.py
View File

@@ -401,7 +401,21 @@ class TestListNetwork(TestNetwork):
self.assertEqual(self.data_long, list(data)) self.assertEqual(self.data_long, list(data))
class TestSetNetwork(common.TestNetworkBase): class TestSetNetwork(TestNetwork):
def setUp(self):
super(TestSetNetwork, self).setUp()
self.network.update_network = mock.Mock(
return_value=None
)
self.network.list_networks = mock.Mock(
return_value={RESOURCES: [copy.deepcopy(RECORD)]}
)
self.cmd = network.SetNetwork(self.app, self.namespace)
def test_set_this(self): def test_set_this(self):
arglist = [ arglist = [
FAKE_NAME, FAKE_NAME,
@@ -415,18 +429,13 @@ class TestSetNetwork(common.TestNetworkBase):
('name', 'noob'), ('name', 'noob'),
('shared', True), ('shared', True),
] ]
lister = mock.Mock(return_value={RESOURCES: [copy.deepcopy(RECORD)]})
self.app.client_manager.network.list_networks = lister
mocker = mock.Mock(return_value=None)
self.app.client_manager.network.update_network = mocker
cmd = network.SetNetwork(self.app, self.namespace)
parsed_args = self.check_parser(cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
exp = {'admin_state_up': True, 'name': 'noob', 'shared': True} exp = {'admin_state_up': True, 'name': 'noob', 'shared': True}
exp_record = {RESOURCE: exp} exp_record = {RESOURCE: exp}
mocker.assert_called_with(FAKE_ID, exp_record) self.network.update_network.assert_called_with(FAKE_ID, exp_record)
self.assertEqual(None, result) self.assertEqual(None, result)
def test_set_that(self): def test_set_that(self):
@@ -440,31 +449,21 @@ class TestSetNetwork(common.TestNetworkBase):
('admin_state', False), ('admin_state', False),
('shared', False), ('shared', False),
] ]
lister = mock.Mock(return_value={RESOURCES: [copy.deepcopy(RECORD)]})
self.app.client_manager.network.list_networks = lister
mocker = mock.Mock(return_value=None)
self.app.client_manager.network.update_network = mocker
cmd = network.SetNetwork(self.app, self.namespace)
parsed_args = self.check_parser(cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
exp = {'admin_state_up': False, 'shared': False} exp = {'admin_state_up': False, 'shared': False}
exp_record = {RESOURCE: exp} exp_record = {RESOURCE: exp}
mocker.assert_called_with(FAKE_ID, exp_record) self.network.update_network.assert_called_with(FAKE_ID, exp_record)
self.assertEqual(None, result) self.assertEqual(None, result)
def test_set_nothing(self): def test_set_nothing(self):
arglist = [FAKE_NAME, ] arglist = [FAKE_NAME, ]
verifylist = [('identifier', FAKE_NAME), ] verifylist = [('identifier', FAKE_NAME), ]
lister = mock.Mock(return_value={RESOURCES: [copy.deepcopy(RECORD)]})
self.app.client_manager.network.list_networks = lister
mocker = mock.Mock(return_value=None)
self.app.client_manager.network.update_network = mocker
cmd = network.SetNetwork(self.app, self.namespace)
parsed_args = self.check_parser(cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(exceptions.CommandError, cmd.take_action, self.assertRaises(exceptions.CommandError, self.cmd.take_action,
parsed_args) parsed_args)