diff options
| author | Tang Chen <tangchen@cn.fujitsu.com> | 2015-12-01 19:59:27 +0800 |
|---|---|---|
| committer | Tang Chen <tangchen@cn.fujitsu.com> | 2015-12-05 10:52:05 +0800 |
| commit | 3cc38d2844408ac2ce0b29d7d8f07ef8dea22417 (patch) | |
| tree | 21302eebf7a8da8bf641b1869370bdc54988f7df /openstackclient/tests/network | |
| parent | af6269d3107adddec4eff2bb2497a387172437ec (diff) | |
| download | python-openstackclient-3cc38d2844408ac2ce0b29d7d8f07ef8dea22417.tar.gz | |
Refactor TestCreateNetwork: Setup cmd in setUp() in TestCreateNetworkIdentityV2
This patch setup the tested command only once in setUp() for TestCreateNetworkIdentityV2.
Change-Id: I689980674c9500c0c040d27164ec61f5fcf40ee5
Implements: blueprint osc-network-unit-test-refactor
Related-to: blueprint neutron-client
Diffstat (limited to 'openstackclient/tests/network')
| -rw-r--r-- | openstackclient/tests/network/v2/test_network.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py index ce0a0de7..c45d624b 100644 --- a/openstackclient/tests/network/v2/test_network.py +++ b/openstackclient/tests/network/v2/test_network.py @@ -181,6 +181,12 @@ class TestCreateNetworkIdentityV2(TestNetwork): def setUp(self): 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): arglist = [ "--project", identity_fakes_v2.project_name, @@ -192,8 +198,6 @@ class TestCreateNetworkIdentityV2(TestNetwork): ('name', FAKE_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( endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN, @@ -205,12 +209,11 @@ class TestCreateNetworkIdentityV2(TestNetwork): copy.deepcopy(identity_fakes_v2.PROJECT), 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': True, 'name': FAKE_NAME, @@ -232,8 +235,6 @@ class TestCreateNetworkIdentityV2(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_v2.FakeIdentityv2Client( endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN, @@ -245,12 +246,12 @@ class TestCreateNetworkIdentityV2(TestNetwork): copy.deepcopy(identity_fakes_v2.PROJECT), 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( AttributeError, - cmd.take_action, + self.cmd.take_action, parsed_args, ) |