openstack/python-openstackclient
Code Issues Proposed changes

Merge "Refactor TestCreateNetwork: Setup cmd in setUp() in TestCreateNetworkIdentityV2"

Browse Source
This commit is contained in:
Jenkins
2015-12-05 17:17:25 +00:00
committed by Gerrit Code Review
parent 92a1a27edc 3cc38d2844
commit 26a7e8d2ef
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,6 +181,12 @@ class TestCreateNetworkIdentityV2(TestNetwork):
def setUp(self): def setUp(self):
super(TestCreateNetworkIdentityV2, self).setUp() super(TestCreateNetworkIdentityV2, 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_with_project_identityv2(self): def test_create_with_project_identityv2(self):
arglist = [ arglist = [
"--project", identity_fakes_v2.project_name, "--project", identity_fakes_v2.project_name,
@@ -192,8 +198,6 @@ class TestCreateNetworkIdentityV2(TestNetwork):
('name', FAKE_NAME), ('name', FAKE_NAME),
('project', identity_fakes_v2.project_name), ('project', identity_fakes_v2.project_name),
] ]
mocker = mock.Mock(return_value=copy.deepcopy(RESPONSE))
self.app.client_manager.network.create_network = mocker
identity_client = identity_fakes_v2.FakeIdentityv2Client( identity_client = identity_fakes_v2.FakeIdentityv2Client(
endpoint=fakes.AUTH_URL, endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN, token=fakes.AUTH_TOKEN,
@@ -205,12 +209,11 @@ class TestCreateNetworkIdentityV2(TestNetwork):
copy.deepcopy(identity_fakes_v2.PROJECT), copy.deepcopy(identity_fakes_v2.PROJECT),
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': True, 'admin_state_up': True,
'name': FAKE_NAME, 'name': FAKE_NAME,
@@ -232,8 +235,6 @@ class TestCreateNetworkIdentityV2(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_v2.FakeIdentityv2Client( identity_client = identity_fakes_v2.FakeIdentityv2Client(
endpoint=fakes.AUTH_URL, endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN, token=fakes.AUTH_TOKEN,
@@ -245,12 +246,12 @@ class TestCreateNetworkIdentityV2(TestNetwork):
copy.deepcopy(identity_fakes_v2.PROJECT), copy.deepcopy(identity_fakes_v2.PROJECT),
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)
self.assertRaises( self.assertRaises(
AttributeError, AttributeError,
cmd.take_action, self.cmd.take_action,
parsed_args, parsed_args,
) )