commit 3cd3419f2e541746f58c49f34e58596b1b7659ba
author Jenkins <jenkins@review.openstack.org> Fri Jun 20 05:55:34 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jun 20 05:55:34 2014 +0000
tree d83085f307685a0c2d4252d567ff46f5dd3100a6
parent 09028474450a59a17bc2afc40187980259dd6e24
parent e81ae6986caccc960e5eaaeebbf1ebaa202562d2

Merge "Use the http image location conf option for api tests"

tempest/api/image/v1/test_images.py

diff --git a/tempest/api/image/v1/test_images.py b/tempest/api/image/v1/test_images.py
index 2df3f7f..2cc2009 100644
--- a/tempest/api/image/v1/test_images.py
+++ b/tempest/api/image/v1/test_images.py
@@ -55,8 +55,7 @@
         resp, body = self.create_image(name='New Remote Image',
                                        container_format='bare',
                                        disk_format='raw', is_public=False,
-                                       location='http://example.com'
-                                                '/someimage.iso',
+                                       location=CONF.image.http_image,
                                        properties={'key1': 'value1',
                                                    'key2': 'value2'})
         self.assertIn('id', body)
@@ -143,7 +142,7 @@
         image
         """
         name = 'New Remote Image %s' % name
-        location = 'http://example.com/someimage_%s.iso' % name
+        location = CONF.image.http_image
         resp, image = cls.create_image(name=name,
                                        container_format=container_format,
                                        disk_format=disk_format,