From 9bfdb4227345d03d9a1a1a13570e2d79b65f4173 Mon Sep 17 00:00:00 2001
From: hpk <none@none>
Date: Sat, 21 Mar 2009 21:20:02 +0100
Subject: [PATCH] [svn r63197] * don't think "showskipsummary" is a useful
 option * some typo fixes

--HG--
branch : trunk
---
 py/test/plugin/pytest_default.py  | 25 +++++++++++++------------
 py/test/plugin/pytest_terminal.py |  7 ++++---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/py/test/plugin/pytest_default.py b/py/test/plugin/pytest_default.py
index 97de832e1..0beeeb906 100644
--- a/py/test/plugin/pytest_default.py
+++ b/py/test/plugin/pytest_default.py
@@ -33,7 +33,7 @@ class DefaultPlugin:
         return Directory(path, parent=parent)
 
     def pytest_addoption(self, parser):
-        group = parser.addgroup("general", "general test process options")
+        group = parser.addgroup("general", "test collection and failure interaction options")
         group._addoption('-v', '--verbose', action="count", 
                    dest="verbose", default=0, help="increase verbosity."),
         group._addoption('-x', '--exitfirst',
@@ -48,26 +48,19 @@ class DefaultPlugin:
         group._addoption('-l', '--showlocals',
                    action="store_true", dest="showlocals", default=False,
                    help="show locals in tracebacks (disabled by default).")
-        group._addoption('--showskipsummary',
-                   action="store_true", dest="showskipsummary", default=False,
-                   help="always show summary of skipped tests") 
+        #group._addoption('--showskipsummary',
+        #           action="store_true", dest="showskipsummary", default=False,
+        #           help="always show summary of skipped tests") 
         group._addoption('--pdb',
                    action="store_true", dest="usepdb", default=False,
                    help="start pdb (the Python debugger) on errors.")
-        group._addoption('--tb',
+        group._addoption('--tb', metavar="style", 
                    action="store", dest="tbstyle", default='long',
                    type="choice", choices=['long', 'short', 'no'],
                    help="traceback verboseness (long/short/no).")
-        group._addoption('--fulltrace',
-                   action="store_true", dest="fulltrace", default=False,
-                   help="don't cut any tracebacks (default is to cut).")
         group._addoption('-s', 
                    action="store_true", dest="nocapture", default=False,
                    help="disable catching of stdout/stderr during test run.")
-        group._addoption('--iocapture', action="store", default="fd", metavar="method",
-                   help="set iocapturing method: fd|sys|no.")
-        group.addoption('--basetemp', dest="basetemp", default=None, metavar="dir",
-                   help="temporary directory for this test run.")
         group.addoption('--boxed',
                    action="store_true", dest="boxed", default=False,
                    help="box each test run in a separate process") 
@@ -89,6 +82,14 @@ class DefaultPlugin:
         group._addoption('--nomagic',
                    action="store_true", dest="nomagic", default=False,
                    help="don't reinterpret asserts, no traceback cutting. ")
+        group._addoption('--fulltrace',
+                   action="store_true", dest="fulltrace", default=False,
+                   help="don't cut any tracebacks (default is to cut).")
+        group.addoption('--basetemp', dest="basetemp", default=None, metavar="dir",
+                   help="base temporary directory for this test run.")
+        group._addoption('--iocapture', action="store", default="fd", metavar="method",
+                   type="choice", choices=['fd', 'sys', 'no'],
+                   help="set iocapturing method: fd|sys|no.")
         group.addoption('--debug',
                    action="store_true", dest="debug", default=False,
                    help="generate and show debugging information.")
diff --git a/py/test/plugin/pytest_terminal.py b/py/test/plugin/pytest_terminal.py
index be4effd70..9af048841 100644
--- a/py/test/plugin/pytest_terminal.py
+++ b/py/test/plugin/pytest_terminal.py
@@ -267,7 +267,7 @@ class TerminalReporter:
 
     def summary_skips(self):
         if 'skipped' in self.stats:
-            if 'failed' not in self.stats or self.config.option.showskipsummary:
+            if 'failed' not in self.stats: #  or self.config.option.showskipsummary:
                 fskips = folded_skips(self.stats['skipped'])
                 if fskips:
                     self.write_sep("_", "skipped test summary")
@@ -557,7 +557,8 @@ class TestTerminal:
                 import py; py.test.skip('skip me please!')
             def test_interrupt_me():
                 raise KeyboardInterrupt   # simulating the user
-        """, configargs=("--showskipsummary",) + ("-v",)*verbose)
+        """, configargs=("-v",)*verbose)
+        #""", configargs=("--showskipsummary",) + ("-v",)*verbose)
         rep = TerminalReporter(modcol.config, file=linecomp.stringio)
         modcol.config.bus.register(rep)
         bus = modcol.config.bus
@@ -579,7 +580,7 @@ class TestTerminal:
             ">       assert 0",
             "E       assert 0",
         ])
-        assert "Skipped: 'skip me please!'" in text
+        #assert "Skipped: 'skip me please!'" in text
         assert "_keyboard_interrupt.py:6: KeyboardInterrupt" in text
         see_details = "raise KeyboardInterrupt   # simulating the user" in text
         assert see_details == verbose