Remove final use of glance_stubs

Removes the final piece of glance_stubs from the image unit tests.

Change-Id: I0db3b6c83edaf91466e85d423ce75b3e75fd3517
Closes-bug: #1293938

1 files changed, 15 insertions, 2 deletions

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index fbc795a84c..d72061e218 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -26,7 +26,6 @@ from nova import context
 from nova import exception
 from nova.image import glance
 from nova import test
-from nova.tests.glance import stubs as glance_stubs
 from nova import utils
 
 CONF = cfg.CONF
@@ -57,7 +56,9 @@ class TestConversions(test.NoDBTestCase):
 
     def _test_extracting_missing_attributes(self, include_locations):
         # Verify behavior from glance objects that are missing attributes
-        class MyFakeGlanceImage(glance_stubs.FakeImage):
+        # TODO(jaypipes): Find a better way of testing this crappy
+        #                 glanceclient magic object stuff.
+        class MyFakeGlanceImage(object):
             def __init__(self, metadata):
                 IMAGE_ATTRIBUTES = ['size', 'owner', 'id', 'created_at',
                                     'updated_at', 'status', 'min_disk',
@@ -66,6 +67,18 @@ class TestConversions(test.NoDBTestCase):
                 raw.update(metadata)
                 self.__dict__['raw'] = raw
 
+            def __getattr__(self, key):
+                try:
+                    return self.__dict__['raw'][key]
+                except KeyError:
+                    raise AttributeError(key)
+
+            def __setattr__(self, key, value):
+                try:
+                    self.__dict__['raw'][key] = value
+                except KeyError:
+                    raise AttributeError(key)
+
         metadata = {
             'id': 1,
             'created_at': NOW_DATETIME,