diff options
| author | Tang Chen <tangchen@cn.fujitsu.com> | 2015-12-01 19:56:20 +0800 |
|---|---|---|
| committer | Tang Chen <tangchen@cn.fujitsu.com> | 2015-12-05 10:52:05 +0800 |
| commit | af6269d3107adddec4eff2bb2497a387172437ec (patch) | |
| tree | e574c9beb9dc4eadff816f16b48904933bd76629 /openstackclient | |
| parent | 038334ff986e76498ca4e02aafe43bb6e1891b11 (diff) | |
| download | python-openstackclient-af6269d3107adddec4eff2bb2497a387172437ec.tar.gz | |
Refactor TestCreateNetwork: Setup cmd in setUp() in TestCreateNetworkIdentityV3
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
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, |