diff options
| author | Tim Burke <tim.burke@gmail.com> | 2019-11-19 21:25:45 -0800 |
|---|---|---|
| committer | Pete Zaitcev <zaitcev@kotori.zaitcev.us> | 2020-06-01 18:38:23 -0500 |
| commit | 99947150dd923ce19112a8f8c35c41f5a1271d72 (patch) | |
| tree | 1513f65fad8da3bd414173beffc78474416fa179 /test/functional/__init__.py | |
| parent | 6c1bc3949d74477706bc2258a45a603d3bfc236c (diff) | |
| download | swift-99947150dd923ce19112a8f8c35c41f5a1271d72.tar.gz | |
func tests: work with etag-quoter on by default
Also, run the in-process encryption func tests like that.
Change-Id: I984ab8d1304d23b89589973950b10dda4aea0db3
Diffstat (limited to 'test/functional/__init__.py')
| -rw-r--r-- | test/functional/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/functional/__init__.py b/test/functional/__init__.py index 4edb721d3..fa824c059 100644 --- a/test/functional/__init__.py +++ b/test/functional/__init__.py @@ -322,12 +322,16 @@ def _load_encryption(proxy_conf_file, swift_conf_file, **kwargs): pipeline = pipeline.replace( "proxy-logging proxy-server", "keymaster encryption proxy-logging proxy-server") + pipeline = pipeline.replace( + "cache listing_formats", + "cache etag-quoter listing_formats") conf.set(section, 'pipeline', pipeline) root_secret = base64.b64encode(os.urandom(32)) if not six.PY2: root_secret = root_secret.decode('ascii') conf.set('filter:keymaster', 'encryption_root_secret', root_secret) conf.set('filter:versioned_writes', 'allow_object_versioning', 'true') + conf.set('filter:etag-quoter', 'enable_by_default', 'true') except NoSectionError as err: msg = 'Error problem with proxy conf file %s: %s' % \ (proxy_conf_file, err) |