Merge "Tidy up nova.image.glance"

6 files changed, 2 insertions, 15 deletions

diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py
index 19d752a9f..ef3995649 100644
--- a/nova/tests/api/openstack/compute/test_server_actions.py
+++ b/nova/tests/api/openstack/compute/test_server_actions.py
@@ -73,7 +73,6 @@ class ServerActionsControllerTest(test.TestCase):
         nova.tests.image.fake.stub_out_image_service(self.stubs)
         service_class = 'nova.image.glance.GlanceImageService'
         self.service = importutils.import_object(service_class)
-        self.service.delete_all()
         self.sent_to_glance = {}
         fakes.stub_out_glance_add_image(self.stubs, self.sent_to_glance)
         self.flags(allow_instance_snapshots=True,
diff --git a/nova/tests/glance/stubs.py b/nova/tests/glance/stubs.py
index b3cef0ff3..4811169fc 100644
--- a/nova/tests/glance/stubs.py
+++ b/nova/tests/glance/stubs.py
@@ -69,7 +69,7 @@ class StubGlanceClient(object):
 
         return self.images[-1]
 
-    def update_image(self, image_id, metadata, data, features):
+    def update_image(self, image_id, metadata, data):
         for i, image in enumerate(self.images):
             if image['id'] == str(image_id):
                 if 'id' in metadata:
diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py
index 66e37e5d5..dea9c14e9 100644
--- a/nova/tests/image/fake.py
+++ b/nova/tests/image/fake.py
@@ -221,9 +221,6 @@ class _FakeImageService(object):
         if not removed:
             raise exception.ImageNotFound(image_id=image_id)
 
-    def delete_all(self):
-        """Clears out all images."""
-        self.images.clear()
 
 _fakeImageService = _FakeImageService()
 
diff --git a/nova/tests/image/test_fake.py b/nova/tests/image/test_fake.py
index ab7f043d2..70ce001b4 100644
--- a/nova/tests/image/test_fake.py
+++ b/nova/tests/image/test_fake.py
@@ -108,14 +108,6 @@ class FakeImageServiceTestCase(test.TestCase):
                           self.context,
                           '34')
 
-    def test_delete_all(self):
-        self.image_service.create(self.context, {'id': '32', 'foo': 'bar'})
-        self.image_service.create(self.context, {'id': '33', 'foo': 'bar'})
-        self.image_service.create(self.context, {'id': '34', 'foo': 'bar'})
-        self.image_service.delete_all()
-        index = self.image_service.detail(self.context)
-        self.assertEquals(len(index), 0)
-
     def test_create_then_get(self):
         blob = 'some data'
         s1 = StringIO.StringIO(blob)
diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 4d866bb7b..fadea5a8c 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -103,7 +103,6 @@ class TestGlanceImageService(test.TestCase):
         client = glance_stubs.StubGlanceClient()
         self.service = self._create_image_service(client)
         self.context = context.RequestContext('fake', 'fake', auth_token=True)
-        self.service.delete_all()
 
     def _create_image_service(self, client):
         def _fake_create_glance_client(context, host, port):
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index e274f477f..a5b88bd0d 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -96,7 +96,7 @@ IMAGE_FIXTURES = {
 
 def set_image_fixtures():
     image_service = fake_image.FakeImageService()
-    image_service.delete_all()
+    image_service.images.clear()
     for image_id, image_meta in IMAGE_FIXTURES.items():
         image_meta = image_meta['image_meta']
         image_meta['id'] = image_id