Fixing integration tests by correctly stubbing image service.

1 files changed, 4 insertions, 4 deletions

diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index 3b4c49c93..5eacc829d 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -152,10 +152,10 @@ class _IntegratedTestBase(test.TestCase):
         f = self._get_flags()
         self.flags(**f)
 
-        def fake_image_service(*args):
-            return nova.image.fake.FakeImageService()
-        self.stubs.Set(
-            nova.image.glance, 'GlanceImageService', fake_image_service)
+        def fake_get_image_service(image_href):
+            image_id = int(str(image_href).split('/')[-1])
+            return (nova.image.fake.FakeImageService(), image_id)
+        self.stubs.Set(nova.image, 'get_image_service', fake_get_image_service)
 
         # set up services
         self.start_service('compute')