tests: Use central SDK client fake

Avoid double mocking.

Change-Id: Ic8fadd41f3687eabd3a149681effae6883edb12e
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

openstackclient/tests/unit/common/test_availability_zone.py

@@ -82,8 +82,6 @@ class TestAvailabilityZone(network_fakes.FakeClientMixin, utils.TestCommand):
     def setUp(self):
         super().setUp()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
-
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.compute_client = self.app.client_manager.sdk_connection.compute
         self.compute_client.availability_zones = mock.Mock()

openstackclient/tests/unit/common/test_extension.py

@@ -34,12 +34,9 @@ class TestExtension(network_fakes.FakeClientMixin, utils.TestCommand):
         self.identity_extensions_mock = identity_client.extensions
         self.identity_extensions_mock.reset_mock()
 
-        sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection = sdk_connection
-
+        sdk_connection = self.app.client_manager.sdk_connection
         self.compute_extensions_mock = sdk_connection.compute.extensions
         self.compute_extensions_mock.reset_mock()
-
         self.volume_extensions_mock = sdk_connection.volume.extensions
         self.volume_extensions_mock.reset_mock()
 

openstackclient/tests/unit/common/test_project_cleanup.py

@@ -15,17 +15,10 @@ from unittest import mock
 
 from openstackclient.common import project_cleanup
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
-from openstackclient.tests.unit import utils as tests_utils
+from openstackclient.tests.unit import utils as test_utils
 
 
-class TestProjectCleanupBase(tests_utils.TestCommand):
-    def setUp(self):
-        super(TestProjectCleanupBase, self).setUp()
-
-        self.app.client_manager.sdk_connection = mock.Mock()
-
-
-class TestProjectCleanup(TestProjectCleanupBase):
+class TestProjectCleanup(test_utils.TestCommand):
     project = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):
@@ -51,7 +44,7 @@ class TestProjectCleanup(TestProjectCleanupBase):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,

openstackclient/tests/unit/compute/v2/test_aggregate.py

@@ -59,7 +59,6 @@ class TestAggregate(compute_fakes.TestComputev2):
         super(TestAggregate, self).setUp()
 
         # Get a shortcut to the AggregateManager Mock
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
         self.sdk_client.aggregates = mock.Mock()

openstackclient/tests/unit/compute/v2/test_console.py

@@ -25,7 +25,6 @@ class TestConsole(compute_fakes.TestComputev2):
         super(TestConsole, self).setUp()
 
         # SDK mock
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
         self.sdk_client.find_server = mock.Mock()

openstackclient/tests/unit/compute/v2/test_flavor.py

@@ -31,7 +31,6 @@ class TestFlavor(compute_fakes.TestComputev2):
         super(TestFlavor, self).setUp()
 
         # SDK mock
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
         self.sdk_client.flavors = mock.Mock()

openstackclient/tests/unit/compute/v2/test_host.py

@@ -26,7 +26,6 @@ class TestHost(compute_fakes.TestComputev2):
         super(TestHost, self).setUp()
 
         # Get a shortcut to the compute client
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
         self.sdk_client.get = mock.Mock()

openstackclient/tests/unit/compute/v2/test_hypervisor.py

@@ -30,7 +30,6 @@ class TestHypervisor(compute_fakes.TestComputev2):
         super().setUp()
 
         # Create and get a shortcut to the compute client mock
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
         self.sdk_client.reset_mock()
 

openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py

@@ -24,7 +24,6 @@ class TestHypervisorStats(compute_fakes.TestComputev2):
         super(TestHypervisorStats, self).setUp()
 
         # Get a shortcut to the compute client hypervisors mock
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
         self.sdk_client.get = mock.Mock()

openstackclient/tests/unit/compute/v2/test_keypair.py

@@ -42,7 +42,6 @@ class TestKeypair(compute_fakes.TestComputev2):
             loaded=True,
         )
 
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
         self.sdk_client.keypairs = mock.Mock()

openstackclient/tests/unit/compute/v2/test_server.py

@@ -70,7 +70,6 @@ class TestServer(compute_fakes.TestComputev2):
         self.servers_mock = self.app.client_manager.compute.servers
         self.servers_mock.reset_mock()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
 

openstackclient/tests/unit/compute/v2/test_server_backup.py

@@ -27,7 +27,6 @@ class TestServerBackup(compute_fakes.TestComputev2):
         super(TestServerBackup, self).setUp()
 
         # Get a shortcut to the compute client ServerManager Mock
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
 

openstackclient/tests/unit/compute/v2/test_server_event.py

@@ -29,7 +29,6 @@ class TestServerEvent(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestServerEvent, self).setUp()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
         self.sdk_client.find_server = mock.Mock()

openstackclient/tests/unit/compute/v2/test_server_group.py

@@ -51,7 +51,6 @@ class TestServerGroup(compute_fakes.TestComputev2):
         super().setUp()
 
         # Create and get a shortcut to the compute client mock
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
         self.sdk_client.reset_mock()
 

openstackclient/tests/unit/compute/v2/test_server_image.py

@@ -26,7 +26,6 @@ class TestServerImage(compute_fakes.TestComputev2):
         super().setUp()
 
         # Get a shortcut to the compute client ServerManager Mock
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
 

openstackclient/tests/unit/compute/v2/test_server_migration.py

@@ -36,7 +36,6 @@ class TestServerMigration(compute_fakes.TestComputev2):
         )
         self.server_migrations_mock.reset_mock()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
 

openstackclient/tests/unit/compute/v2/test_server_volume.py

@@ -26,7 +26,6 @@ class TestServerVolume(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.app.client_manager.sdk_connection.volume = mock.Mock()
         self.compute_client = self.app.client_manager.sdk_connection.compute

openstackclient/tests/unit/compute/v2/test_service.py

@@ -28,7 +28,6 @@ class TestService(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestService, self).setUp()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
 

openstackclient/tests/unit/compute/v2/test_usage.py

@@ -22,7 +22,6 @@ class TestUsage(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestUsage, self).setUp()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
 

openstackclient/tests/unit/fakes.py

@@ -115,12 +115,16 @@ class FakeClientManager(object):
         self.object_store = None
         self.volume = None
         self.network = None
+        self.sdk_connection = mock.Mock()
+
         self.session = None
         self.auth_ref = None
         self.auth_plugin_name = None
+
         self.network_endpoint_enabled = True
         self.compute_endpoint_enabled = True
         self.volume_endpoint_enabled = True
+
         # The source of configuration. This is either 'cloud_config' (a
         # clouds.yaml file) or 'global_env' ('OS_'-prefixed envvars)
         self.configuration_type = 'cloud_config'

openstackclient/tests/unit/volume/v2/test_volume_backup.py

@@ -41,7 +41,6 @@ class TestBackup(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
         self.app.client_manager.sdk_connection.volume = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.volume
         patcher = mock.patch.object(