diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-05 17:11:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-05 17:11:49 +0000 |
| commit | 92a1a27edc141486d13bc7f8f15454ab0f58c8fb (patch) | |
| tree | 6651d170c7e2d90938eb0812dbb5108d89da5a0d /openstackclient | |
| parent | c1e4e25991386cb1237844836a1b0cdc6bbaad65 (diff) | |
| parent | af6269d3107adddec4eff2bb2497a387172437ec (diff) | |
| download | python-openstackclient-92a1a27edc141486d13bc7f8f15454ab0f58c8fb.tar.gz | |
Merge "Refactor TestCreateNetwork: Setup cmd in setUp() in TestCreateNetworkIdentityV3"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/network/v2/test_network.py | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py index 510e06b9..ce0a0de7 100644 --- a/openstackclient/tests/network/v2/test_network.py +++ b/openstackclient/tests/network/v2/test_network.py @@ -77,6 +77,12 @@ class TestCreateNetworkIdentityV3(TestNetwork): def setUp(self): 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): arglist = [ FAKE_NAME, @@ -87,14 +93,11 @@ class TestCreateNetworkIdentityV3(TestNetwork): ('shared', 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) - result = list(cmd.take_action(parsed_args)) + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + result = list(self.cmd.take_action(parsed_args)) - mocker.assert_called_with({ + self.network.create_network.assert_called_with({ RESOURCE: { 'admin_state_up': True, 'name': FAKE_NAME, @@ -117,8 +120,6 @@ class TestCreateNetworkIdentityV3(TestNetwork): ('project_domain', identity_fakes_v3.domain_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( endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN, @@ -136,12 +137,11 @@ class TestCreateNetworkIdentityV3(TestNetwork): copy.deepcopy(identity_fakes_v3.DOMAIN), loaded=True, ) - cmd = network.CreateNetwork(self.app, self.namespace) - parsed_args = self.check_parser(cmd, arglist, verifylist) - result = list(cmd.take_action(parsed_args)) + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + result = list(self.cmd.take_action(parsed_args)) - mocker.assert_called_with({ + self.network.create_network.assert_called_with({ RESOURCE: { 'admin_state_up': False, 'name': FAKE_NAME, @@ -162,14 +162,11 @@ class TestCreateNetworkIdentityV3(TestNetwork): ('shared', False), ('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) - result = list(cmd.take_action(parsed_args)) + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + result = list(self.cmd.take_action(parsed_args)) - mocker.assert_called_with({ + self.network.create_network.assert_called_with({ RESOURCE: { 'admin_state_up': True, 'name': FAKE_NAME, |