Merge "image: Remove FakeImage test helper"

4 files changed, 19 insertions, 28 deletions

diff --git a/openstackclient/tests/unit/compute/v2/test_aggregate.py b/openstackclient/tests/unit/compute/v2/test_aggregate.py
index cad85e4d..3a7a81cb 100644
--- a/openstackclient/tests/unit/compute/v2/test_aggregate.py
+++ b/openstackclient/tests/unit/compute/v2/test_aggregate.py
@@ -554,7 +554,7 @@ class TestAggregateUnset(TestAggregate):
 
 class TestAggregateCacheImage(TestAggregate):
 
-    images = image_fakes.FakeImage.create_images(count=2)
+    images = image_fakes.create_images(count=2)
 
     def setUp(self):
         super(TestAggregateCacheImage, self).setUp()
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 50fdef28..480dcfe1 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -1430,7 +1430,7 @@ class TestServerCreate(TestServer):
 
         self.servers_mock.create.return_value = self.new_server
 
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.find_image_mock.return_value = self.image
         self.get_image_mock.return_value = self.image
 
@@ -3180,7 +3180,7 @@ class TestServerCreate(TestServer):
             'hypervisor_type': 'qemu',
         }
 
-        _image = image_fakes.FakeImage.create_one_image(image_info)
+        _image = image_fakes.create_one_image(image_info)
         self.images_mock.return_value = [_image]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -3236,7 +3236,7 @@ class TestServerCreate(TestServer):
             'hypervisor_type': 'qemu',
             'hw_disk_bus': 'ide',
         }
-        _image = image_fakes.FakeImage.create_one_image(image_info)
+        _image = image_fakes.create_one_image(image_info)
         self.images_mock.return_value = [_image]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -3293,7 +3293,7 @@ class TestServerCreate(TestServer):
             'hw_disk_bus': 'ide',
         }
 
-        _image = image_fakes.FakeImage.create_one_image(image_info)
+        _image = image_fakes.create_one_image(image_info)
         self.images_mock.return_value = [_image]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -3325,8 +3325,8 @@ class TestServerCreate(TestServer):
             }
         }
 
-        target_image = image_fakes.FakeImage.create_one_image(image_info)
-        another_image = image_fakes.FakeImage.create_one_image({})
+        target_image = image_fakes.create_one_image(image_info)
+        another_image = image_fakes.create_one_image({})
         self.images_mock.return_value = [target_image, another_image]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -4364,7 +4364,7 @@ class _TestServerList(TestServer):
         self.servers = self.setup_servers_mock(3)
         self.servers_mock.list.return_value = self.servers
 
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
 
         # self.images_mock.return_value = [self.image]
         self.find_image_mock.return_value = self.image
@@ -6361,7 +6361,7 @@ class TestServerRebuild(TestServer):
         super(TestServerRebuild, self).setUp()
 
         # Return value for utils.find_resource for image
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.get_image_mock.return_value = self.image
 
         # Fake the rebuilt new server.
@@ -6391,7 +6391,7 @@ class TestServerRebuild(TestServer):
 
     def test_rebuild_with_image_name(self):
         image_name = 'my-custom-image'
-        user_image = image_fakes.FakeImage.create_one_image(
+        user_image = image_fakes.create_one_image(
             attrs={'name': image_name})
         self.find_image_mock.return_value = user_image
 
@@ -6940,7 +6940,7 @@ class TestEvacuateServer(TestServer):
     def setUp(self):
         super(TestEvacuateServer, self).setUp()
         # Return value for utils.find_resource for image
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.images_mock.get.return_value = self.image
 
         # Fake the rebuilt new server.
@@ -7134,7 +7134,7 @@ class TestServerRescue(TestServer):
         super(TestServerRescue, self).setUp()
 
         # Return value for utils.find_resource for image
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.get_image_mock.return_value = self.image
 
         new_server = compute_fakes.FakeServer.create_one_server()
@@ -7175,7 +7175,7 @@ class TestServerRescue(TestServer):
         self.server.rescue.assert_called_with(image=None, password=None)
 
     def test_rescue_with_new_image(self):
-        new_image = image_fakes.FakeImage.create_one_image()
+        new_image = image_fakes.create_one_image()
         self.find_image_mock.return_value = new_image
         arglist = [
             '--image', new_image.id,
@@ -8293,7 +8293,7 @@ class TestServerShow(TestServer):
     def setUp(self):
         super(TestServerShow, self).setUp()
 
-        self.image = image_fakes.FakeImage.create_one_image()
+        self.image = image_fakes.create_one_image()
         self.flavor = compute_fakes.FakeFlavor.create_one_flavor()
         self.topology = {
             'nodes': [{'vcpu_set': [0, 1]}, {'vcpu_set': [2, 3]}],
@@ -9000,7 +9000,7 @@ class TestServerGeneral(TestServer):
         # - The first time, return server info.
         # - The second time, return image info.
         # - The third time, return flavor info.
-        _image = image_fakes.FakeImage.create_one_image()
+        _image = image_fakes.create_one_image()
         _flavor = compute_fakes.FakeFlavor.create_one_flavor()
         server_info = {
             'image': {u'id': _image.id},
diff --git a/openstackclient/tests/unit/compute/v2/test_server_backup.py b/openstackclient/tests/unit/compute/v2/test_server_backup.py
index 1644baae..1a5e0a12 100644
--- a/openstackclient/tests/unit/compute/v2/test_server_backup.py
+++ b/openstackclient/tests/unit/compute/v2/test_server_backup.py
@@ -91,7 +91,7 @@ class TestServerBackupCreate(TestServerBackup):
 
     def setup_images_mock(self, count, servers=None):
         if servers:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'name': servers[0].name,
                     'status': 'active',
@@ -99,7 +99,7 @@ class TestServerBackupCreate(TestServerBackup):
                 count=count,
             )
         else:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'status': 'active',
                 },
@@ -178,15 +178,6 @@ class TestServerBackupCreate(TestServerBackup):
     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)
-#         images = image_fakes.FakeImage.create_images(
-#             attrs={
-#                 'name': servers[0].name,
-#                 'status': 'active',
-#             },
-#             count=1,
-#         )
-#
-#         self.images_mock.find_image.return_value = images[0]
         self.images_mock.get_image = mock.Mock(
             side_effect=images[0],
         )
diff --git a/openstackclient/tests/unit/compute/v2/test_server_image.py b/openstackclient/tests/unit/compute/v2/test_server_image.py
index b73cc763..db0e1d9e 100644
--- a/openstackclient/tests/unit/compute/v2/test_server_image.py
+++ b/openstackclient/tests/unit/compute/v2/test_server_image.py
@@ -89,7 +89,7 @@ class TestServerImageCreate(TestServerImage):
 
     def setup_images_mock(self, count, servers=None):
         if servers:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'name': servers[0].name,
                     'status': 'active',
@@ -97,7 +97,7 @@ class TestServerImageCreate(TestServerImage):
                 count=count,
             )
         else:
-            images = image_fakes.FakeImage.create_images(
+            images = image_fakes.create_images(
                 attrs={
                     'status': 'active',
                 },