Merged in anthon_van_der_neut/pytest/opt-drop-non-hyphened-long-options (pull request #57)

changes to addoption() for hyphenated long-options

_pytest/assertion/__init__.py

@@ -19,8 +19,8 @@ def pytest_addoption(parser):
 to provide assert expression information. """)
     group.addoption('--no-assert', action="store_true", default=False,
         dest="noassert", help="DEPRECATED equivalent to --assert=plain")
-    group.addoption('--nomagic', action="store_true", default=False,
+    group.addoption('--nomagic', '--no-magic', action="store_true", 
-        dest="nomagic", help="DEPRECATED equivalent to --assert=plain")
+        default=False, help="DEPRECATED equivalent to --assert=plain")
 
 class AssertionState:
     """State for the assertion plugin."""

_pytest/helpconfig.py

@@ -13,8 +13,8 @@ def pytest_addoption(parser):
     group._addoption('-p', action="append", dest="plugins", default = [],
                metavar="name",
                help="early-load given plugin (multi-allowed).")
-    group.addoption('--traceconfig',
+    group.addoption('--traceconfig', '--trace-config',
-               action="store_true", dest="traceconfig", default=False,
+               action="store_true", default=False,
                help="trace considerations of conftest.py files."),
     group.addoption('--debug',
                action="store_true", dest="debug", default=False,

_pytest/junitxml.py

@@ -62,10 +62,10 @@ def bin_xml_escape(arg):
 
 def pytest_addoption(parser):
     group = parser.getgroup("terminal reporting")
-    group.addoption('--junitxml', action="store", dest="xmlpath",
+    group.addoption('--junitxml', '--junit-xml', action="store", 
-           metavar="path", default=None,
+           dest="xmlpath", metavar="path", default=None, 
            help="create junit-xml style report file at given path.")
-    group.addoption('--junitprefix', action="store", dest="junitprefix",
+    group.addoption('--junitprefix', '--junit-prefix', action="store",
            metavar="str", default=None,
            help="prepend prefix to classnames in junit-xml output")
 

_pytest/main.py

@@ -41,13 +41,14 @@ def pytest_addoption(parser):
                help="run pytest in strict mode, warnings become errors.")
 
     group = parser.getgroup("collect", "collection")
-    group.addoption('--collectonly',
+    group.addoption('--collectonly', '--collect-only', action="store_true", 
-        action="store_true", dest="collectonly",
         help="only collect tests, don't execute them."),
     group.addoption('--pyargs', action="store_true",
         help="try to interpret all arguments as python packages.")
     group.addoption("--ignore", action="append", metavar="path",
         help="ignore path during collection (multi-allowed).")
+    # when changing this to --conf-cut-dir, config.py Conftest.setinitial
+    # needs upgrading as well
     group.addoption('--confcutdir', dest="confcutdir", default=None,
         metavar="dir",
         help="only load conftest.py's relative to specified dir.")

_pytest/resultlog.py

@@ -6,7 +6,7 @@ import py
 
 def pytest_addoption(parser):
     group = parser.getgroup("terminal reporting", "resultlog plugin options")
-    group.addoption('--resultlog', action="store", dest="resultlog",
+    group.addoption('--resultlog', '--result-log', action="store", 
         metavar="path", default=None,
         help="path for machine-readable result log.")
 

_pytest/terminal.py

@@ -27,8 +27,8 @@ def pytest_addoption(parser):
                action="store", dest="tbstyle", default='long',
                choices=['long', 'short', 'no', 'line', 'native'],
                help="traceback print mode (long/short/line/native/no).")
-    group._addoption('--fulltrace',
+    group._addoption('--fulltrace', '--full-trace',
-               action="store_true", dest="fulltrace", default=False,
+               action="store_true", default=False,
                help="don't cut any tracebacks (default is to cut).")
 
 def pytest_configure(config):

testing/test_parseopt.py

@@ -267,7 +267,6 @@ def test_argcomplete(testdir, monkeypatch):
         # argcomplete not found
         pytest.skip("argcomplete not available")
     else:
-        #print 'type ---------------', result.stdout, result.stdout.lines
         if py.std.sys.version_info < (2,7):
             result.stdout.lines = result.stdout.lines[0].split('\x0b')
             result.stdout.fnmatch_lines(["--funcargs", "--fulltrace"])