From 1e65b50f6069f52936d4c18fefd214cf64038ad9 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 22 Jun 2023 08:48:47 -0400 Subject: [PATCH] qa/s3tests: clean up extra_attrs and extra_args logic Signed-off-by: Casey Bodley --- qa/tasks/s3tests.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py index 8c019fd76a2..4f951afd8d8 100644 --- 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 -- 2.39.5