Merge "tests: Use consistent shortcut to fake image client"

Author: Zuul

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

@@ -167,6 +167,7 @@ def setUp(self):
         )
 
         self.app.client_manager.image = mock.Mock()
+        self.image_client = self.app.client_manager.image
 
         self.app.client_manager.volume = volume_fakes.FakeVolumeClient(
             endpoint=fakes.AUTH_URL,

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

@@ -31,10 +31,6 @@ def setUp(self):
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
 
-        # Get a shortcut to the image client ImageManager Mock
-        self.images_mock = self.app.client_manager.image
-        self.images_mock.find_image.reset_mock()
-
         # Set object attributes to be tested. Could be overwritten in subclass.
         self.attrs = {}
 
@@ -102,8 +98,7 @@ def setup_images_mock(self, count, servers=None):
                 count=count,
             )
 
-        # self.images_mock.get = mock.Mock(side_effect=images)
-        self.images_mock.find_image = mock.Mock(side_effect=images)
+        self.image_client.find_image = mock.Mock(side_effect=images)
         return images
 
     def test_server_backup_defaults(self):
@@ -177,7 +172,7 @@ def test_server_backup_create_options(self):
     def test_server_backup_wait_fail(self, mock_wait_for_status):
         servers = self.setup_servers_mock(count=1)
         images = self.setup_images_mock(count=1, servers=servers)
-        self.images_mock.get_image = mock.Mock(
+        self.image_client.get_image = mock.Mock(
             side_effect=images[0],
         )
 
@@ -211,15 +206,15 @@ def test_server_backup_wait_fail(self, mock_wait_for_status):
         )
 
         mock_wait_for_status.assert_called_once_with(
-            self.images_mock.get_image, images[0].id, callback=mock.ANY
+            self.image_client.get_image, images[0].id, callback=mock.ANY
         )
 
     @mock.patch.object(common_utils, 'wait_for_status', return_value=True)
     def test_server_backup_wait_ok(self, mock_wait_for_status):
         servers = self.setup_servers_mock(count=1)
         images = self.setup_images_mock(count=1, servers=servers)
 
-        self.images_mock.get_image = mock.Mock(
+        self.image_client.get_image = mock.Mock(
             side_effect=images[0],
         )
 
@@ -252,7 +247,7 @@ def test_server_backup_wait_ok(self, mock_wait_for_status):
         )
 
         mock_wait_for_status.assert_called_once_with(
-            self.images_mock.get_image, images[0].id, callback=mock.ANY
+            self.image_client.get_image, images[0].id, callback=mock.ANY
         )
 
         self.assertEqual(self.image_columns(images[0]), columns)

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

@@ -30,10 +30,6 @@ def setUp(self):
         self.app.client_manager.sdk_connection.compute = mock.Mock()
         self.sdk_client = self.app.client_manager.sdk_connection.compute
 
-        # Get a shortcut to the image client ImageManager Mock
-        self.images_mock = self.app.client_manager.image
-        self.images_mock.find_image.reset_mock()
-
         # Set object attributes to be tested. Could be overwritten in subclass.
         self.attrs = {}
 
@@ -100,7 +96,7 @@ def setup_images_mock(self, count, servers=None):
                 count=count,
             )
 
-        self.images_mock.find_image = mock.Mock(side_effect=images)
+        self.image_client.find_image = mock.Mock(side_effect=images)
         self.sdk_client.create_server_image = mock.Mock(
             return_value=images[0],
         )
@@ -192,7 +188,7 @@ def test_server_create_image_wait_fail(self, mock_wait_for_status):
         )
 
         mock_wait_for_status.assert_called_once_with(
-            self.images_mock.get_image, images[0].id, callback=mock.ANY
+            self.image_client.get_image, images[0].id, callback=mock.ANY
         )
 
     @mock.patch.object(common_utils, 'wait_for_status', return_value=True)
@@ -222,7 +218,7 @@ def test_server_create_image_wait_ok(self, mock_wait_for_status):
         )
 
         mock_wait_for_status.assert_called_once_with(
-            self.images_mock.get_image, images[0].id, callback=mock.ANY
+            self.image_client.get_image, images[0].id, callback=mock.ANY
         )
 
         self.assertEqual(self.image_columns(images[0]), columns)

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

@@ -27,14 +27,13 @@ def setUp(self):
         super().setUp()
 
         self.app.client_manager.image = mock.Mock()
+        self.image_client = self.app.client_manager.image
 
         self.app.client_manager.volume = volume_fakes.FakeVolumev1Client(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
         )
 
-        self.client = self.app.client_manager.image
-
 
 def create_one_image(attrs=None):
     """Create a fake image.