From 4fe51e646c44d8e5f65ec0267895dd6c77ad53a4 Mon Sep 17 00:00:00 2001 From: hpk Date: Sat, 21 Mar 2009 16:04:30 +0100 Subject: [PATCH] [svn r63187] tweaks to cmdline options --HG-- branch : trunk --- py/test/plugin/pytest_default.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/py/test/plugin/pytest_default.py b/py/test/plugin/pytest_default.py index 7bb8170b8..40bfd9ca4 100644 --- a/py/test/plugin/pytest_default.py +++ b/py/test/plugin/pytest_default.py @@ -69,7 +69,7 @@ class DefaultPlugin: group.addoption('--boxed', action="store_true", dest="boxed", default=False, help="box each test run in a separate process") - group._addoption('--plugin', '-p', action="append", dest="plugin", default = [], + group._addoption('-p', action="append", dest="plugin", default = [], help=("load the specified plugin after command line parsing. " "Example: '-p hello' will trigger 'import pytest_hello' " "and instantiate 'HelloPlugin' from the module.")) @@ -173,5 +173,6 @@ def test_plugin_specify(testdir): ) def test_plugin_already_exists(testdir): - config = testdir.parseconfig("--plugin", "default") + config = testdir.parseconfig("-p", "default") assert config.option.plugin == ['default'] + config.pytestplugins.do_configure(config)