summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-29 18:13:04 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-29 18:13:04 -0700
commit4c16db6ad330b0c3a1bdde098bbdcf958fc23bdf (patch)
tree1c0a477883ea4b3a53c26732de7c6a662590944b
parentbe8bf22f90e322823cb3cf4963f5c7313ef727ec (diff)
Rename MockImageService -> FakeImageService
-rw-r--r--nova/image/fake.py4
-rw-r--r--nova/tests/integrated/integrated_helpers.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/image/fake.py b/nova/image/fake.py
index 4caf68d63..c84f7ec02 100644
--- a/nova/image/fake.py
+++ b/nova/image/fake.py
@@ -28,7 +28,7 @@ LOG = logging.getLogger('nova.image.fake')
FLAGS = flags.FLAGS
-class MockImageService(service.BaseImageService):
+class FakeImageService(service.BaseImageService):
"""Mock (fake) image service for unit testing."""
def __init__(self):
@@ -43,7 +43,7 @@ class MockImageService(service.BaseImageService):
'disk_format': 'ami'}
}
self.create(None, image)
- super(MockImageService, self).__init__()
+ super(FakeImageService, self).__init__()
def index(self, context):
"""Returns list of images."""
diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index e0fe2d2a2..2e5d67017 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -184,7 +184,7 @@ class _IntegratedTestBase(test.TestCase):
def _get_flags(self):
"""An opportunity to setup flags, before the services are started."""
f = {}
- f['image_service'] = 'nova.image.fake.MockImageService'
+ f['image_service'] = 'nova.image.fake.FakeImageService'
f['fake_network'] = True
return f