From e7fa8920d069f7625efc1312778818fd7b732b61 Mon Sep 17 00:00:00 2001 From: Huanxuan Ao Date: Wed, 20 Jul 2016 19:12:02 +0800 Subject: Set identity v3 client in networkv2 fake Set identity v3 client in fake so that we needn't set it everytime when we use it in unit test. Change-Id: I9ed71056a357642e5aef7b670a7c85918aca59b9 --- openstackclient/tests/network/v2/test_subnet.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'openstackclient/tests/network/v2/test_subnet.py') diff --git a/openstackclient/tests/network/v2/test_subnet.py b/openstackclient/tests/network/v2/test_subnet.py index e24b49e8..e7f3e748 100644 --- a/openstackclient/tests/network/v2/test_subnet.py +++ b/openstackclient/tests/network/v2/test_subnet.py @@ -18,7 +18,6 @@ from osc_lib import exceptions from osc_lib import utils from openstackclient.network.v2 import subnet as subnet_v2 -from openstackclient.tests import fakes from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3 from openstackclient.tests.network.v2 import fakes as network_fakes from openstackclient.tests import utils as tests_utils @@ -31,6 +30,10 @@ class TestSubnet(network_fakes.TestNetworkV2): # Get a shortcut to the network client self.network = self.app.client_manager.network + # Get a shortcut to the ProjectManager Mock + self.projects_mock = self.app.client_manager.identity.projects + # Get a shortcut to the DomainManager Mock + self.domains_mock = self.app.client_manager.identity.domains class TestCreateSubnet(TestSubnet): @@ -178,20 +181,7 @@ class TestCreateSubnet(TestSubnet): # Get the command object to test self.cmd = subnet_v2.CreateSubnet(self.app, self.namespace) - # Set identity client v3. And get a shortcut to Identity client. - identity_client = identity_fakes_v3.FakeIdentityv3Client( - endpoint=fakes.AUTH_URL, - token=fakes.AUTH_TOKEN, - ) - self.app.client_manager.identity = identity_client - self.identity = self.app.client_manager.identity - - # Get a shortcut to the ProjectManager Mock - self.projects_mock = self.identity.projects self.projects_mock.get.return_value = self.project - - # Get a shortcut to the DomainManager Mock - self.domains_mock = self.identity.domains self.domains_mock.get.return_value = self.domain # Mock SDK calls for all tests. -- cgit v1.2.1