From 80a3c34901d522aaa0a153d7828c58cbff3d06c6 Mon Sep 17 00:00:00 2001 From: Yaroslav Lobankov Date: Mon, 11 Jan 2016 21:15:52 +0300 Subject: [PATCH] [Gates] Remove redundant args from `rally verify ...` commands If you take a look, for example, at this log file [1], you will see that --html and --json arguments are specified two times. This patch fixes this issue. [1] http://logs.openstack.org/02/265902/2/check/gate-rally-dsvm-verify-full/78ebb06/console.html#_2016-01-11_17_19_14_576 Change-Id: Iefc8e8c5bcf0dce8e43532badf29fb4041f5e2be --- tests/ci/rally_verify.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/ci/rally_verify.py b/tests/ci/rally_verify.py index eb73b003..08f23d0e 100755 --- a/tests/ci/rally_verify.py +++ b/tests/ci/rally_verify.py @@ -119,10 +119,10 @@ def launch_verification_once(launch_parameters): """Launch verification and show results in different formats.""" results = call_rally("verify start %s" % launch_parameters) results["uuid"] = envutils.get_global(envutils.ENV_VERIFICATION) - results["result_in_html"] = call_rally( - "verify results --html", output_type="html") - results["result_in_json"] = call_rally( - "verify results --json", output_type="json") + results["result_in_html"] = call_rally("verify results", + output_type="html") + results["result_in_json"] = call_rally("verify results", + output_type="json") results["show"] = call_rally("verify show") results["show_detailed"] = call_rally("verify show --detailed") # NOTE(andreykurilin): we need to clean verification uuid from global @@ -135,11 +135,9 @@ def do_compare(uuid_1, uuid_2): """Compare and save results in different formats.""" results = {} for output_format in ("csv", "html", "json"): - cmd = ("verify compare --uuid-1 %(uuid-1)s --uuid-2 %(uuid-2)s " - "--%(output_format)s") % { + cmd = "verify compare --uuid-1 %(uuid-1)s --uuid-2 %(uuid-2)s" % { "uuid-1": uuid_1, - "uuid-2": uuid_2, - "output_format": output_format + "uuid-2": uuid_2 } results[output_format] = call_rally(cmd, output_type=output_format) return results