Fixing the tests

1 files changed, 8 insertions, 3 deletions

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 041da1e13..033b8389c 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -17,6 +17,7 @@
 
 
 import datetime
+import stubout
 import unittest
 
 from nova import context
@@ -60,12 +61,16 @@ class BaseGlanceTest(unittest.TestCase):
     NOW_DATETIME = datetime.datetime(2010, 10, 11, 10, 30, 22)
 
     def setUp(self):
-        # FIXME(sirp): we can probably use stubs library here rather than
-        # dependency injection
+        self.stubs = stubout.StubOutForTesting()
         self.client = StubGlanceClient(None)
-        self.service = glance.GlanceImageService(self.client)
+        self.service = glance.GlanceImageService()
+        self.stubs.Set(self.service, 'client', self.client)
         self.context = context.RequestContext(None, None)
 
+    def tearDown(self):
+        self.stubs.UnsetAll()
+        super(BaseGlanceTest, self).tearDown()
+
     def assertDateTimesFilled(self, image_meta):
         self.assertEqual(image_meta['created_at'], self.NOW_DATETIME)
         self.assertEqual(image_meta['updated_at'], self.NOW_DATETIME)