Make functional tests set node_staging_uri
Currently it is not possible to configure the staging directory URI of the functional workers. We need to be able to do that in order to enable the stage cleaning behavior. Right now, they're all sharing /tmp/staging, which will cause workers to conflict while running in parallel. This causes them to use their private test directory, which may also help some other spurious failures due to interaction. Related-Bug: #1913625 Change-Id: Ic2ac2a528206c50c38e948a096daf9eb8e5eb715 (cherry picked from commite9852fb625
) (cherry picked from commit8e216b4913
)
This commit is contained in:
parent
cc22468d74
commit
54060e8b72
|
@ -418,6 +418,9 @@ class ApiServer(Server):
|
|||
|
||||
self.send_identity_headers = False
|
||||
|
||||
self.node_staging_uri = 'file://%s' % os.path.join(
|
||||
self.test_dir, 'staging')
|
||||
|
||||
self.conf_base = """[DEFAULT]
|
||||
debug = %(debug)s
|
||||
default_log_levels = eventlet.wsgi.server=DEBUG
|
||||
|
@ -450,6 +453,7 @@ image_tag_quota=%(image_tag_quota)s
|
|||
image_location_quota=%(image_location_quota)s
|
||||
location_strategy=%(location_strategy)s
|
||||
allow_additional_image_properties = True
|
||||
node_staging_uri=%(node_staging_uri)s
|
||||
[oslo_policy]
|
||||
policy_file = %(policy_file)s
|
||||
policy_default_rule = %(policy_default_rule)s
|
||||
|
|
|
@ -234,7 +234,6 @@ class TestImages(functional.FunctionalTest):
|
|||
self.stop_servers()
|
||||
|
||||
def test_image_import_using_web_download(self):
|
||||
self.config(node_staging_uri="file:///tmp/staging/")
|
||||
self.start_servers(**self.__dict__.copy())
|
||||
|
||||
# Image list should be empty
|
||||
|
@ -4736,7 +4735,6 @@ class TestImagesMultipleBackend(functional.MultipleBackendFunctionalTest):
|
|||
self.stop_servers()
|
||||
|
||||
def test_image_import_using_web_download(self):
|
||||
self.config(node_staging_uri="file:///tmp/staging/")
|
||||
self.start_servers(**self.__dict__.copy())
|
||||
|
||||
# Image list should be empty
|
||||
|
@ -4899,7 +4897,6 @@ class TestImagesMultipleBackend(functional.MultipleBackendFunctionalTest):
|
|||
self.stop_servers()
|
||||
|
||||
def test_image_import_using_web_download_different_backend(self):
|
||||
self.config(node_staging_uri="file:///tmp/staging/")
|
||||
self.start_servers(**self.__dict__.copy())
|
||||
|
||||
# Image list should be empty
|
||||
|
@ -5063,7 +5060,6 @@ class TestImagesMultipleBackend(functional.MultipleBackendFunctionalTest):
|
|||
self.stop_servers()
|
||||
|
||||
def test_image_import_multi_stores(self):
|
||||
self.config(node_staging_uri="file:///tmp/staging/")
|
||||
self.start_servers(**self.__dict__.copy())
|
||||
|
||||
# Image list should be empty
|
||||
|
@ -5678,7 +5674,6 @@ class TestImagesMultipleBackend(functional.MultipleBackendFunctionalTest):
|
|||
self.stop_servers()
|
||||
|
||||
def test_image_import_multi_stores_specifying_all_stores(self):
|
||||
self.config(node_staging_uri="file:///tmp/staging/")
|
||||
self.start_servers(**self.__dict__.copy())
|
||||
|
||||
# Image list should be empty
|
||||
|
|
Loading…
Reference in New Issue