qa/s3tests: clean up extra_attrs and extra_args logic

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

diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index 8c019fd76a2219ad1e409dd7f9728dff29cfd6e9..4f951afd8d86f13e8651244ec1bc93ad7b86c3fb 100644 (file)
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -384,11 +384,9 @@ def run_tests(ctx, config):
         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