diff options
| author | Ali Maredia <amaredia@redhat.com> | 2023-06-22 22:15:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-22 22:15:02 +0200 |
| commit | 26fda85af2ec7a62b8d36151d519fb343675a1a0 (patch) | |
| tree | e2c7a6708966250f0ac5f5b97bd400cb3c5f0771 /qa | |
| parent | Merge pull request #52085 from alimaredia/wip-rgw-tempest-keystone-fix (diff) | |
| parent | qa/s3tests: remove stale comment about rfc2616 (diff) | |
| download | ceph-26fda85af2ec7a62b8d36151d519fb343675a1a0.tar.xz ceph-26fda85af2ec7a62b8d36151d519fb343675a1a0.zip | |
Merge pull request #52156 from cbodley/wip-qa-rgw-s3tests-extra-attrs
qa/rgw/s3tests: make extra_attrs additive
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml | 3 | ||||
| -rw-r--r-- | qa/tasks/s3tests.py | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml index daab5581df8..69ff8108179 100644 --- a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml @@ -12,5 +12,4 @@ tasks: client.0: dbstore_tests: True rgw_server: client.0 - extra_attrs: ["not fails_on_rgw","not fails_on_dbstore"] - + extra_attrs: ["not fails_on_dbstore"] diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py index 3856f8fadcd..7959627be47 100644 --- a/qa/tasks/s3tests.py +++ b/qa/tasks/s3tests.py @@ -377,18 +377,15 @@ def run_tests(ctx, config): args += ['REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt'] else: args += ['REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt'] - # civetweb > 1.8 && beast parsers are strict on rfc2616 attrs = ["not fails_on_rgw", "not lifecycle_expiration", "not test_of_sts", "not webidentity_test"] if client_config.get('calling-format') != 'ordinary': attrs += ['not fails_with_subdomain'] if not client_config.get('with-sse-s3'): attrs += ['not sse_s3'] - if 'extra_attrs' in client_config: - attrs = client_config.get('extra_attrs') + attrs += client_config.get('extra_attrs', []) args += ['tox', '--', '-v', '-m', ' and '.join(attrs)] - if 'extra_args' in client_config: - args.append(client_config['extra_args']) + args += client_config.get('extra_args', []) toxvenv_sh(ctx, remote, args, label="s3 tests against rgw") yield |