From 05d8b8fba1422af2829d9a79123dec495b57a1d8 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Thu, 5 Nov 2020 17:36:26 -0800 Subject: [PATCH] Increase container_update_timeout in in-process func tests This should make us less likely to fail in the gate because of listing consistency issues. Drive-by: Remove the allowed_headers override; that hasn't been necessary since we updated the default value a while back. Change-Id: Id280bc93ed6e899a62b0115fdf144a564ef0cd8d Related-Change: Ib82e175096716e42aecdab48f01f079e09da6a1d --- test/functional/__init__.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/functional/__init__.py b/test/functional/__init__.py index ace5526107..5bfe7f9762 100644 --- a/test/functional/__init__.py +++ b/test/functional/__init__.py @@ -581,16 +581,11 @@ def in_process_setup(the_object_server=object_server): 'swift_dir': _testdir, 'mount_check': 'false', 'client_timeout': '4', + 'container_update_timeout': '3', 'allow_account_management': 'true', 'account_autocreate': 'true', 'allow_versions': 'True', 'allow_versioned_writes': 'True', - # TODO: move this into s3api config loader because they are - # required by only s3api - 'allowed_headers': - "Content-Disposition, Content-Encoding, X-Delete-At, " - "X-Object-Manifest, X-Static-Large-Object, Cache-Control, " - "Content-Language, Expires, X-Robots-Tag", # Below are values used by the functional test framework, as well as # by the various in-process swift servers 'auth_uri': 'http://127.0.0.1:%d/auth/v1.0/' % prolis.getsockname()[1],