Merge "Make functional tests set node_staging_uri" into stable/victoria
This commit is contained in:
commit
b0521f12c5
|
@ -424,6 +424,9 @@ class ApiServer(Server):
|
||||||
|
|
||||||
self.send_identity_headers = False
|
self.send_identity_headers = False
|
||||||
|
|
||||||
|
self.node_staging_uri = 'file://%s' % os.path.join(
|
||||||
|
self.test_dir, 'staging')
|
||||||
|
|
||||||
self.conf_base = """[DEFAULT]
|
self.conf_base = """[DEFAULT]
|
||||||
debug = %(debug)s
|
debug = %(debug)s
|
||||||
default_log_levels = eventlet.wsgi.server=DEBUG,stevedore.extension=INFO
|
default_log_levels = eventlet.wsgi.server=DEBUG,stevedore.extension=INFO
|
||||||
|
@ -453,6 +456,7 @@ image_tag_quota=%(image_tag_quota)s
|
||||||
image_location_quota=%(image_location_quota)s
|
image_location_quota=%(image_location_quota)s
|
||||||
location_strategy=%(location_strategy)s
|
location_strategy=%(location_strategy)s
|
||||||
allow_additional_image_properties = True
|
allow_additional_image_properties = True
|
||||||
|
node_staging_uri=%(node_staging_uri)s
|
||||||
[oslo_policy]
|
[oslo_policy]
|
||||||
policy_file = %(policy_file)s
|
policy_file = %(policy_file)s
|
||||||
policy_default_rule = %(policy_default_rule)s
|
policy_default_rule = %(policy_default_rule)s
|
||||||
|
|
|
@ -235,7 +235,6 @@ class TestImages(functional.FunctionalTest):
|
||||||
self.stop_servers()
|
self.stop_servers()
|
||||||
|
|
||||||
def test_image_import_using_web_download(self):
|
def test_image_import_using_web_download(self):
|
||||||
self.config(node_staging_uri="file:///tmp/staging/")
|
|
||||||
self.start_servers(**self.__dict__.copy())
|
self.start_servers(**self.__dict__.copy())
|
||||||
|
|
||||||
# Image list should be empty
|
# Image list should be empty
|
||||||
|
@ -4817,7 +4816,6 @@ class TestImagesMultipleBackend(functional.MultipleBackendFunctionalTest):
|
||||||
self.stop_servers()
|
self.stop_servers()
|
||||||
|
|
||||||
def test_image_import_using_web_download(self):
|
def test_image_import_using_web_download(self):
|
||||||
self.config(node_staging_uri="file:///tmp/staging/")
|
|
||||||
self.start_servers(**self.__dict__.copy())
|
self.start_servers(**self.__dict__.copy())
|
||||||
|
|
||||||
# Image list should be empty
|
# Image list should be empty
|
||||||
|
@ -4980,7 +4978,6 @@ class TestImagesMultipleBackend(functional.MultipleBackendFunctionalTest):
|
||||||
self.stop_servers()
|
self.stop_servers()
|
||||||
|
|
||||||
def test_image_import_using_web_download_different_backend(self):
|
def test_image_import_using_web_download_different_backend(self):
|
||||||
self.config(node_staging_uri="file:///tmp/staging/")
|
|
||||||
self.start_servers(**self.__dict__.copy())
|
self.start_servers(**self.__dict__.copy())
|
||||||
|
|
||||||
# Image list should be empty
|
# Image list should be empty
|
||||||
|
@ -5144,7 +5141,6 @@ class TestImagesMultipleBackend(functional.MultipleBackendFunctionalTest):
|
||||||
self.stop_servers()
|
self.stop_servers()
|
||||||
|
|
||||||
def test_image_import_multi_stores(self):
|
def test_image_import_multi_stores(self):
|
||||||
self.config(node_staging_uri="file:///tmp/staging/")
|
|
||||||
self.start_servers(**self.__dict__.copy())
|
self.start_servers(**self.__dict__.copy())
|
||||||
|
|
||||||
# Image list should be empty
|
# Image list should be empty
|
||||||
|
@ -5759,7 +5755,6 @@ class TestImagesMultipleBackend(functional.MultipleBackendFunctionalTest):
|
||||||
self.stop_servers()
|
self.stop_servers()
|
||||||
|
|
||||||
def test_image_import_multi_stores_specifying_all_stores(self):
|
def test_image_import_multi_stores_specifying_all_stores(self):
|
||||||
self.config(node_staging_uri="file:///tmp/staging/")
|
|
||||||
self.start_servers(**self.__dict__.copy())
|
self.start_servers(**self.__dict__.copy())
|
||||||
|
|
||||||
# Image list should be empty
|
# Image list should be empty
|
||||||
|
|
Loading…
Reference in New Issue