openstack/python-openstackclient
Code Issues Proposed changes

Refactor TestCreateNetwork: Setup cmd in setUp() in TestCreateNetworkIdentityV3

Browse Source 
This patch setup the tested command only once in setUp() for TestCreateNetworkIdentityV3.

Change-Id: Iff5119fa24c9cc0caa72ff0e8f63e8dcac72470a
Implements: blueprint osc-network-unit-test-refactor
Related-to: blueprint neutron-client
This commit is contained in:
Tang Chen
2015-12-01 19:56:20 +08:00
parent 038334ff98
commit af6269d310
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,12 @@ class TestCreateNetworkIdentityV3(TestNetwork):
def setUp(self): def setUp(self):
super(TestCreateNetworkIdentityV3, self).setUp() super(TestCreateNetworkIdentityV3, self).setUp()
self.new_network = mock.Mock(return_value=copy.deepcopy(RESPONSE))
self.network.create_network = self.new_network
# Get the command object to test
self.cmd = network.CreateNetwork(self.app, self.namespace)
def test_create_no_options(self): def test_create_no_options(self):
arglist = [ arglist = [
FAKE_NAME, FAKE_NAME,
@@ -87,14 +93,11 @@ class TestCreateNetworkIdentityV3(TestNetwork):
('shared', None), ('shared', None),
('project', None), ('project', None),
] ]
mocker = mock.Mock(return_value=copy.deepcopy(RESPONSE))
self.app.client_manager.network.create_network = mocker
cmd = network.CreateNetwork(self.app, self.namespace)
parsed_args = self.check_parser(cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = list(cmd.take_action(parsed_args)) result = list(self.cmd.take_action(parsed_args))
mocker.assert_called_with({ self.network.create_network.assert_called_with({
RESOURCE: { RESOURCE: {
'admin_state_up': True, 'admin_state_up': True,
'name': FAKE_NAME, 'name': FAKE_NAME,
@@ -117,8 +120,6 @@ class TestCreateNetworkIdentityV3(TestNetwork):
('project_domain', identity_fakes_v3.domain_name), ('project_domain', identity_fakes_v3.domain_name),
('name', FAKE_NAME), ('name', FAKE_NAME),
] ]
mocker = mock.Mock(return_value=copy.deepcopy(RESPONSE))
self.app.client_manager.network.create_network = mocker
identity_client = identity_fakes_v3.FakeIdentityv3Client( identity_client = identity_fakes_v3.FakeIdentityv3Client(
endpoint=fakes.AUTH_URL, endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN, token=fakes.AUTH_TOKEN,
@@ -136,12 +137,11 @@ class TestCreateNetworkIdentityV3(TestNetwork):
copy.deepcopy(identity_fakes_v3.DOMAIN), copy.deepcopy(identity_fakes_v3.DOMAIN),
loaded=True, loaded=True,
) )
cmd = network.CreateNetwork(self.app, self.namespace)
parsed_args = self.check_parser(cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = list(cmd.take_action(parsed_args)) result = list(self.cmd.take_action(parsed_args))
mocker.assert_called_with({ self.network.create_network.assert_called_with({
RESOURCE: { RESOURCE: {
'admin_state_up': False, 'admin_state_up': False,
'name': FAKE_NAME, 'name': FAKE_NAME,
@@ -162,14 +162,11 @@ class TestCreateNetworkIdentityV3(TestNetwork):
('shared', False), ('shared', False),
('name', FAKE_NAME), ('name', FAKE_NAME),
] ]
mocker = mock.Mock(return_value=copy.deepcopy(RESPONSE))
self.app.client_manager.network.create_network = mocker
cmd = network.CreateNetwork(self.app, self.namespace)
parsed_args = self.check_parser(cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = list(cmd.take_action(parsed_args)) result = list(self.cmd.take_action(parsed_args))
mocker.assert_called_with({ self.network.create_network.assert_called_with({
RESOURCE: { RESOURCE: {
'admin_state_up': True, 'admin_state_up': True,
'name': FAKE_NAME, 'name': FAKE_NAME,