summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorTodd Willey <todd@rubidine.com>2010-07-15 00:31:28 -0400
committerTodd Willey <todd@rubidine.com>2010-07-15 00:31:28 -0400
commite6603bf8eee1641f91649ae573529bd882bb71e6 (patch)
tree61083116dee8450c4463fb2dfce4edc26addf08d /nova/tests
parent2b09635a385c05bdb1479fd93671d49e6d5f9b24 (diff)
parent6bed8cde37af2614367f2ecb45bbc43d412ccd4c (diff)
Merge remote branch 'origin/uec'
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/objectstore_unittest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py
index cee567c8b..ddd455a73 100644
--- a/nova/tests/objectstore_unittest.py
+++ b/nova/tests/objectstore_unittest.py
@@ -155,7 +155,7 @@ class ObjectStoreTestCase(test.BaseTestCase):
bucket[os.path.basename(path)] = open(path, 'rb').read()
# register an image
- objectstore.image.Image.create('i-testing', 'image_bucket/1mb.manifest.xml', self.context)
+ objectstore.image.Image.register_aws_image('i-testing', 'image_bucket/1mb.manifest.xml', self.context)
# verify image
my_img = objectstore.image.Image('i-testing')