From 0ecfbbcd7b10cee02915d30f92063d6d2837adb5 Mon Sep 17 00:00:00 2001 From: Andreas Tolfsen Date: Wed, 6 Jan 2016 16:53:35 +0000 Subject: [PATCH] Bug 1221187: testing/marionette/client: Explicitly define --version flag; r=automatedtester Passing the version keyword to argparse's constructor implicitly adds -v and --version flags that conflicts with the -v/--verbose flag that is added in BaseMarionetteArguments. This removes -v as an alias to --version, which unbreaks testing on try because it uses runtests.py. It's perhaps worth mentioning that try uses runtests.py because it does not (yet) have a full checkout of the source when it runs the tests. --HG-- extra : rebase_source : 39ce70480c06268c9c7d49ef707514c817dbf922 --- testing/marionette/client/marionette/runtests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/marionette/client/marionette/runtests.py b/testing/marionette/client/marionette/runtests.py index 5dfe46f09037..c9b7877b2bd5 100644 --- a/testing/marionette/client/marionette/runtests.py +++ b/testing/marionette/client/marionette/runtests.py @@ -38,16 +38,16 @@ class MarionetteHarness(object): self.args = args or self.parse_args() def parse_args(self, logger_defaults=None): - parser = self._parser_class( - usage='%(prog)s [options] test_file_or_dir ...', + parser = self._parser_class(usage='%(prog)s [options] test_file_or_dir ...') + parser.add_argument('--version', action='version', + help="Show version information.", version="%(prog)s {version}" " (using marionette-driver: {driver_version}, " "marionette-transport: {transport_version})".format( version=__version__, driver_version=driver_version, transport_version=transport_version - ) - ) + )) mozlog.commandline.add_logging_group(parser) args = parser.parse_args() parser.verify_usage(args)