qa/s3tests: make extra_attrs additive

the s3tests.py task is filtering out several attrs by default. but
when dbstore uses `extra_attrs` to add 'not fails_on_dbstore', it
overwrites those other filters

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml
index daab5581df83b5a6c4e68b8215f0b1b13576fe56..69ff8108179b660bd67157392aedaeaa0fc34687 100644 (file)
--- 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 3856f8fadcd4f83b341e6505711e639ec311edb8..8c019fd76a2219ad1e409dd7f9728dff29cfd6e9 100644 (file)
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -385,7 +385,7 @@ def run_tests(ctx, config):
             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'])