From 73b10812c57d0356efe2217536619ab118ec396a Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 22 Jul 2009 16:11:26 +0200
Subject: [PATCH 01/15] remove not used files

--HG--
branch : 1.0.x
---
 MANIFEST | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 1ef10deee..623f802bf 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -29,21 +29,16 @@ doc/test/extend.txt
 doc/test/features.txt
 doc/test/funcargs.txt
 doc/test/plugin/doctest.txt
-doc/test/plugin/execnetcleanup.txt
 doc/test/plugin/figleaf.txt
-doc/test/plugin/hooklog.txt
 doc/test/plugin/hookspec.txt
 doc/test/plugin/index.txt
 doc/test/plugin/iocapture.txt
-doc/test/plugin/keyword.txt
 doc/test/plugin/monkeypatch.txt
-doc/test/plugin/pdb.txt
+doc/test/plugin/oejskit.txt
 doc/test/plugin/pocoo.txt
-doc/test/plugin/pytester.txt
 doc/test/plugin/recwarn.txt
 doc/test/plugin/restdoc.txt
 doc/test/plugin/resultlog.txt
-doc/test/plugin/runner.txt
 doc/test/plugin/terminal.txt
 doc/test/plugin/unittest.txt
 doc/test/plugin/xfail.txt

From 875ebc18ef7826705a8d82c0ecace5bef427fc87 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 23 Jul 2009 20:16:27 +0200
Subject: [PATCH 02/15] targetting a b9

--HG--
branch : 1.0.x
---
 CHANGELOG      | 4 ++++
 py/__init__.py | 2 +-
 setup.py       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 24148b1ea..1ef53b75e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Changes between 1.0.0b8 and 1.0.0b9
+=====================================
+
+
 Changes between 1.0.0b7 and 1.0.0b8
 =====================================
 
diff --git a/py/__init__.py b/py/__init__.py
index 6d6bdaffb..b75980bba 100644
--- a/py/__init__.py
+++ b/py/__init__.py
@@ -20,7 +20,7 @@ For questions please check out http://pylib.org/contact.html
 from initpkg import initpkg
 trunk = None
 
-version = trunk or "1.0.0b8"
+version = trunk or "1.0.0b9"
 
 initpkg(__name__,
     description = "py.test and pylib: advanced testing tool and networking lib", 
diff --git a/setup.py b/setup.py
index 749c22969..4b94ca098 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@ def main():
         name='py',
         description='py.test and pylib: advanced testing tool and networking lib',
         long_description = long_description, 
-        version= trunk or '1.0.0b8', 
+        version= trunk or '1.0.0b9', 
         url='http://pylib.org', 
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], 

From 04e9197fd6138adaf953ba8fef37085b8f75e71e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sat, 25 Jul 2009 18:09:01 +0200
Subject: [PATCH 03/15] * reworked per-test output capturing into the
 pytest_iocapture.py plugin

* removed all capturing code from config object and pytest_default plugins

* item.repr_failure(excinfo) instead of item.repr_failure(excinfo, outerr)

* added a few logging tests

--HG--
branch : 1.0.x
---
 CHANGELOG                             |  5 +++
 py/test/collect.py                    | 14 +++----
 py/test/config.py                     | 37 -----------------
 py/test/defaultconftest.py            |  2 +-
 py/test/dist/testing/test_dsession.py |  2 +-
 py/test/plugin/pytest_default.py      |  3 --
 py/test/plugin/pytest_doctest.py      |  6 +--
 py/test/plugin/pytest_iocapture.py    | 60 ++++++++++++++++++++++++++-
 py/test/plugin/pytest_runner.py       | 49 ++++++++++------------
 py/test/plugin/test_pytest_runner.py  | 49 +++++++++-------------
 py/test/pycollect.py                  |  5 ++-
 py/test/testing/acceptance_test.py    | 22 ----------
 py/test/testing/test_config.py        | 55 ------------------------
 13 files changed, 118 insertions(+), 191 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1ef53b75e..1ed977434 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 Changes between 1.0.0b8 and 1.0.0b9
 =====================================
 
+* reworked per-test output capturing into the pytest_iocapture.py plugin 
+  and thus removed capturing code from config object 
+
+* item.repr_failure(excinfo) instead of item.repr_failure(excinfo, outerr)
+
 
 Changes between 1.0.0b7 and 1.0.0b8
 =====================================
diff --git a/py/test/collect.py b/py/test/collect.py
index a56ec496c..c7bbdb556 100644
--- a/py/test/collect.py
+++ b/py/test/collect.py
@@ -247,7 +247,8 @@ class Node(object):
         return col._getitembynames(names)
     _fromtrail = staticmethod(_fromtrail)
 
-    def _repr_failure_py(self, excinfo, outerr):
+    def _repr_failure_py(self, excinfo, outerr=None):
+        assert outerr is None, "XXX deprecated"
         excinfo.traceback = self._prunetraceback(excinfo.traceback)
         # XXX temporary hack: getrepr() should not take a 'style' argument
         # at all; it should record all data in all cases, and the style
@@ -256,13 +257,9 @@ class Node(object):
             style = "short"
         else:
             style = "long"
-        repr = excinfo.getrepr(funcargs=True, 
+        return excinfo.getrepr(funcargs=True, 
                                showlocals=self.config.option.showlocals,
                                style=style)
-        for secname, content in zip(["out", "err"], outerr):
-            if content:
-                repr.addsection("Captured std%s" % secname, content.rstrip())
-        return repr 
 
     repr_failure = _repr_failure_py
     shortfailurerepr = "F"
@@ -291,9 +288,10 @@ class Collector(Node):
             if colitem.name == name:
                 return colitem
 
-    def repr_failure(self, excinfo, outerr):
+    def repr_failure(self, excinfo, outerr=None):
         """ represent a failure. """
-        return self._repr_failure_py(excinfo, outerr)
+        assert outerr is None, "XXX deprecated"
+        return self._repr_failure_py(excinfo)
 
     def _memocollect(self):
         """ internal helper method to cache results of calling collect(). """
diff --git a/py/test/config.py b/py/test/config.py
index 4c468ae19..2ef394ba9 100644
--- a/py/test/config.py
+++ b/py/test/config.py
@@ -240,20 +240,6 @@ class Config(object):
         finally: 
             config_per_process = py.test.config = oldconfig 
 
-    def _getcapture(self, path=None):
-        if self.option.nocapture:
-            iocapture = "no" 
-        else:
-            iocapture = self.getvalue("iocapture", path=path)
-        if iocapture == "fd": 
-            return py.io.StdCaptureFD()
-        elif iocapture == "sys":
-            return py.io.StdCapture()
-        elif iocapture == "no": 
-            return py.io.StdCapture(out=False, err=False, in_=False)
-        else:
-            raise self.Error("unknown io capturing: " + iocapture)
-
     def getxspecs(self):
         xspeclist = []
         for xspec in self.getvalue("tx"):
@@ -286,29 +272,6 @@ class Config(object):
         if pydir is not None:
             roots.append(pydir)
         return roots 
-
-    def guardedcall(self, func):
-        excinfo = result = None
-        capture = self._getcapture()
-        try:
-            try:
-                result = func()
-            except KeyboardInterrupt:
-                raise
-            except:
-                excinfo = py.code.ExceptionInfo()
-        finally:
-            stdout, stderr = capture.reset()
-        return CallResult(result, excinfo, stdout, stderr)
-
-class CallResult:
-    def __init__(self, result, excinfo, stdout, stderr):
-        self.stdout = stdout 
-        self.stderr = stderr
-        self.outerr = (self.stdout, self.stderr)
-        self.excinfo = excinfo
-        if excinfo is None:
-            self.result = result 
     
 #
 # helpers
diff --git a/py/test/defaultconftest.py b/py/test/defaultconftest.py
index 6ee22fb4e..91622956b 100644
--- a/py/test/defaultconftest.py
+++ b/py/test/defaultconftest.py
@@ -10,5 +10,5 @@ Generator = py.test.collect.Generator
 Function = py.test.collect.Function
 Instance = py.test.collect.Instance
 
-pytest_plugins = "default runner terminal keyword xfail tmpdir execnetcleanup monkeypatch recwarn pdb unittest".split()
+pytest_plugins = "default iocapture runner terminal keyword xfail tmpdir execnetcleanup monkeypatch recwarn pdb unittest".split()
 
diff --git a/py/test/dist/testing/test_dsession.py b/py/test/dist/testing/test_dsession.py
index 02679a75c..ec33526cc 100644
--- a/py/test/dist/testing/test_dsession.py
+++ b/py/test/dist/testing/test_dsession.py
@@ -7,7 +7,7 @@ XSpec = py.execnet.XSpec
 def run(item, node, excinfo=None):
     runner = item.config.pluginmanager.getplugin("runner")
     rep = runner.ItemTestReport(item=item, 
-        excinfo=excinfo, when="call", outerr=("", ""))
+        excinfo=excinfo, when="call")
     rep.node = node
     return rep 
 
diff --git a/py/test/plugin/pytest_default.py b/py/test/plugin/pytest_default.py
index 7b9959339..83c53306d 100644
--- a/py/test/plugin/pytest_default.py
+++ b/py/test/plugin/pytest_default.py
@@ -60,9 +60,6 @@ def pytest_addoption(parser):
                action="store", dest="tbstyle", default='long',
                type="choice", choices=['long', 'short', 'no'],
                help="traceback verboseness (long/short/no).")
-    group._addoption('-s', 
-               action="store_true", dest="nocapture", default=False,
-               help="disable catching of stdout/stderr during test run.")
     group._addoption('-p', action="append", dest="plugin", default = [],
                help=("load the specified plugin after command line parsing. "))
     group._addoption('-f', '--looponfail',
diff --git a/py/test/plugin/pytest_doctest.py b/py/test/plugin/pytest_doctest.py
index 79400b6df..4497bf874 100644
--- a/py/test/plugin/pytest_doctest.py
+++ b/py/test/plugin/pytest_doctest.py
@@ -45,7 +45,7 @@ class DoctestItem(py.test.collect.Item):
         super(DoctestItem, self).__init__(name=name, parent=parent)
         self.fspath = path 
 
-    def repr_failure(self, excinfo, outerr):
+    def repr_failure(self, excinfo):
         if excinfo.errisinstance(py.compat.doctest.DocTestFailure):
             doctestfailure = excinfo.value
             example = doctestfailure.example
@@ -67,9 +67,9 @@ class DoctestItem(py.test.collect.Item):
             return ReprFailDoctest(reprlocation, lines)
         elif excinfo.errisinstance(py.compat.doctest.UnexpectedException):
             excinfo = py.code.ExceptionInfo(excinfo.value.exc_info)
-            return super(DoctestItem, self).repr_failure(excinfo, outerr)
+            return super(DoctestItem, self).repr_failure(excinfo)
         else: 
-            return super(DoctestItem, self).repr_failure(excinfo, outerr)
+            return super(DoctestItem, self).repr_failure(excinfo)
 
 class DoctestTextfile(DoctestItem):
     def runtest(self):
diff --git a/py/test/plugin/pytest_iocapture.py b/py/test/plugin/pytest_iocapture.py
index 5fa9bb4ea..46c031090 100644
--- a/py/test/plugin/pytest_iocapture.py
+++ b/py/test/plugin/pytest_iocapture.py
@@ -28,6 +28,64 @@ will be restored.
 
 import py
 
+def pytest_addoption(parser):
+    group = parser.getgroup("general")
+    group._addoption('-s', 
+       action="store_true", dest="nocapture", default=False,
+       help="disable catching of stdout/stderr during test run.")
+
+def pytest_configure(config):
+    if not config.option.nocapture:
+        config.pluginmanager.register(CapturePerTest())
+
+def determine_capturing(config, path=None):
+    iocapture = config.getvalue("iocapture", path=path)
+    if iocapture == "fd": 
+        return py.io.StdCaptureFD()
+    elif iocapture == "sys":
+        return py.io.StdCapture()
+    elif iocapture == "no": 
+        return py.io.StdCapture(out=False, err=False, in_=False)
+    else:
+        # how to raise errors here? 
+        raise config.Error("unknown io capturing: " + iocapture)
+
+class CapturePerTest:
+    def __init__(self):
+        self.item2capture = {}
+        
+    def _setcapture(self, item):
+        assert item not in self.item2capture
+        cap = determine_capturing(item.config, path=item.fspath)
+        self.item2capture[item] = cap
+
+    def pytest_runtest_setup(self, item):
+        self._setcapture(item)
+
+    def pytest_runtest_call(self, item):
+        self._setcapture(item)
+
+    def pytest_runtest_teardown(self, item):
+        self._setcapture(item)
+
+    def pytest_keyboard_interrupt(self, excinfo):
+        for cap in self.item2capture.values():
+            cap.reset()
+        self.item2capture.clear()
+
+    def pytest_runtest_makereport(self, __call__, item, call):
+        capture = self.item2capture.pop(item)
+        outerr = capture.reset()
+        # XXX shift reporting elsewhere 
+        rep = __call__.execute(firstresult=True)
+        if hasattr(rep, 'longrepr'):
+            repr = rep.longrepr
+            if hasattr(repr, 'addsection'):
+                for secname, content in zip(["out", "err"], outerr):
+                    if content:
+                        repr.addsection("Captured std%s" % secname, content.rstrip())
+        return rep
+
 def pytest_funcarg__capsys(request):
     """captures writes to sys.stdout/sys.stderr and makes 
     them available successively via a ``capsys.reset()`` method 
@@ -52,7 +110,7 @@ def pytest_pyfunc_call(pyfuncitem):
             if funcarg == "capsys" or funcarg == "capfd":
                 value.reset()
 
-class Capture:
+class Capture: # funcarg
     _capture = None
     def __init__(self, captureclass):
         self._captureclass = captureclass
diff --git a/py/test/plugin/pytest_runner.py b/py/test/plugin/pytest_runner.py
index eedb1a2fc..c43fd14f4 100644
--- a/py/test/plugin/pytest_runner.py
+++ b/py/test/plugin/pytest_runner.py
@@ -31,15 +31,15 @@ def pytest_sessionfinish(session, exitstatus):
         mod.raiseExceptions = False 
 
 def pytest_make_collect_report(collector):
-    call = collector.config.guardedcall(
-        lambda: collector._memocollect()
-    )
-    result = None
-    if not call.excinfo:
-        result = call.result
-    return CollectReport(collector, result, call.excinfo, call.outerr)
-
-    return report 
+    # XXX capturing is missing
+    result = excinfo = None
+    try:
+        result = collector._memocollect()
+    except KeyboardInterrupt:
+        raise
+    except:
+        excinfo = py.code.ExceptionInfo()
+    return CollectReport(collector, result, excinfo)
 
 def pytest_runtest_protocol(item):
     if item.config.getvalue("boxed"):
@@ -66,7 +66,7 @@ def pytest_runtest_call(item):
         item.runtest()
 
 def pytest_runtest_makereport(item, call):
-    return ItemTestReport(item, call.excinfo, call.when, call.outerr)
+    return ItemTestReport(item, call.excinfo, call.when)
 
 def pytest_runtest_teardown(item):
     item.config._setupstate.teardown_exact(item)
@@ -82,7 +82,6 @@ def call_and_report(item, when, log=True):
         hook.pytest_runtest_logreport(rep=report) 
     return report
 
-
 class RuntestHookCall:
     excinfo = None 
     _prefix = "pytest_runtest_"
@@ -90,16 +89,12 @@ class RuntestHookCall:
         self.when = when 
         hookname = self._prefix + when 
         hook = getattr(item.config.hook, hookname)
-        capture = item.config._getcapture()
         try:
-            try:
-                self.result = hook(item=item)
-            except KeyboardInterrupt:
-                raise
-            except:
-                self.excinfo = py.code.ExceptionInfo()
-        finally:
-            self.outerr = capture.reset()
+            self.result = hook(item=item)
+        except KeyboardInterrupt:
+            raise
+        except:
+            self.excinfo = py.code.ExceptionInfo()
 
 def forked_run_report(item):
     # for now, we run setup/teardown in the subprocess 
@@ -149,10 +144,9 @@ class BaseReport(object):
 class ItemTestReport(BaseReport):
     failed = passed = skipped = False
 
-    def __init__(self, item, excinfo=None, when=None, outerr=None):
+    def __init__(self, item, excinfo=None, when=None):
         self.item = item 
         self.when = when
-        self.outerr = outerr
         if item and when != "setup":
             self.keywords = item.readkeywords() 
         else:
@@ -173,14 +167,14 @@ class ItemTestReport(BaseReport):
             elif excinfo.errisinstance(Skipped):
                 self.skipped = True 
                 shortrepr = "s"
-                longrepr = self.item._repr_failure_py(excinfo, outerr)
+                longrepr = self.item._repr_failure_py(excinfo)
             else:
                 self.failed = True
                 shortrepr = self.item.shortfailurerepr
                 if self.when == "call":
-                    longrepr = self.item.repr_failure(excinfo, outerr)
+                    longrepr = self.item.repr_failure(excinfo)
                 else: # exception in setup or teardown 
-                    longrepr = self.item._repr_failure_py(excinfo, outerr)
+                    longrepr = self.item._repr_failure_py(excinfo)
                     shortrepr = shortrepr.lower()
             self.shortrepr = shortrepr 
             self.longrepr = longrepr 
@@ -191,14 +185,13 @@ class ItemTestReport(BaseReport):
 class CollectReport(BaseReport):
     skipped = failed = passed = False 
 
-    def __init__(self, collector, result, excinfo=None, outerr=None):
+    def __init__(self, collector, result, excinfo=None):
         self.collector = collector 
         if not excinfo:
             self.passed = True
             self.result = result 
         else:
-            self.outerr = outerr
-            self.longrepr = self.collector._repr_failure_py(excinfo, outerr)
+            self.longrepr = self.collector._repr_failure_py(excinfo)
             if excinfo.errisinstance(Skipped):
                 self.skipped = True
                 self.reason = str(excinfo.value)
diff --git a/py/test/plugin/test_pytest_runner.py b/py/test/plugin/test_pytest_runner.py
index e0e7c2348..4b279d56b 100644
--- a/py/test/plugin/test_pytest_runner.py
+++ b/py/test/plugin/test_pytest_runner.py
@@ -126,7 +126,7 @@ class BaseFunctionalTests:
         testdir.makepyfile(conftest="""
             import py
             class Function(py.test.collect.Function):
-                def repr_failure(self, excinfo, outerr):
+                def repr_failure(self, excinfo):
                     return "hello" 
         """)
         reports = testdir.runitem("""
@@ -143,7 +143,7 @@ class BaseFunctionalTests:
         #assert rep.failed.where.path.basename == "test_func.py" 
         #assert rep.failed.failurerepr == "hello"
 
-    def test_failure_in_setup_function_ignores_custom_failure_repr(self, testdir):
+    def test_failure_in_setup_function_ignores_custom_repr(self, testdir):
         testdir.makepyfile(conftest="""
             import py
             class Function(py.test.collect.Function):
@@ -168,21 +168,6 @@ class BaseFunctionalTests:
         #assert rep.outcome.where.path.basename == "test_func.py" 
         #assert instanace(rep.failed.failurerepr, PythonFailureRepr)
 
-    def test_capture_in_func(self, testdir):
-        reports = testdir.runitem("""
-            import sys
-            def setup_function(func):
-                print "in setup"
-            def test_func():
-                print "in function"
-                assert 0
-            def teardown_function(func):
-                print "in teardown"
-        """)
-        assert reports[0].outerr[0] == "in setup\n"
-        assert reports[1].outerr[0] == "in function\n"
-        assert reports[2].outerr[0] == "in teardown\n"
-        
     def test_systemexit_does_not_bail_out(self, testdir):
         try:
             reports = testdir.runitem("""
@@ -208,6 +193,23 @@ class BaseFunctionalTests:
         else: 
             py.test.fail("did not raise")
 
+    @py.test.mark.xfail
+    def test_capture_per_func(self, testdir):
+        reports = testdir.runitem("""
+            import sys
+            def setup_function(func):
+                print "in setup"
+            def test_func():
+                print "in function"
+                assert 0
+            def teardown_function(func):
+                print "in teardown"
+        """)
+        assert reports[0].outerr[0] == "in setup\n"
+        assert reports[1].outerr[0] == "in function\n"
+        assert reports[2].outerr[0] == "in teardown\n"
+        
+
 
 class TestExecutionNonForked(BaseFunctionalTests):
     def getrunner(self):
@@ -287,16 +289,3 @@ def test_functional_boxed(testdir):
         "*1 failed*"
     ])
 
-def test_logging_interaction(testdir):
-    p = testdir.makepyfile("""
-        def test_logging():
-            import logging
-            import StringIO
-            stream = StringIO.StringIO()
-            logging.basicConfig(stream=stream)
-            stream.close() # to free memory/release resources
-    """)
-    result = testdir.runpytest(p)
-    assert result.stderr.str().find("atexit") == -1
-        
-    
diff --git a/py/test/pycollect.py b/py/test/pycollect.py
index 76394a588..25072c373 100644
--- a/py/test/pycollect.py
+++ b/py/test/pycollect.py
@@ -271,8 +271,9 @@ class FunctionMixin(PyobjMixin):
             traceback = ntraceback.filter()
         return traceback 
 
-    def repr_failure(self, excinfo, outerr):
-        return self._repr_failure_py(excinfo, outerr)
+    def repr_failure(self, excinfo, outerr=None):
+        assert outerr is None, "XXX outerr usage is deprecated"
+        return self._repr_failure_py(excinfo)
 
     shortfailurerepr = "F"
 
diff --git a/py/test/testing/acceptance_test.py b/py/test/testing/acceptance_test.py
index 03075d75a..c78eebed7 100644
--- a/py/test/testing/acceptance_test.py
+++ b/py/test/testing/acceptance_test.py
@@ -227,28 +227,6 @@ class TestGeneralUsage:
             "*test_traceback_failure.py:4: AssertionError"
         ])
 
-    def test_capturing_outerr(self, testdir): 
-        p1 = testdir.makepyfile("""
-            import sys 
-            def test_capturing():
-                print 42
-                print >>sys.stderr, 23 
-            def test_capturing_error():
-                print 1
-                print >>sys.stderr, 2
-                raise ValueError
-        """)
-        result = testdir.runpytest(p1)
-        result.stdout.fnmatch_lines([
-            "*test_capturing_outerr.py .F", 
-            "====* FAILURES *====",
-            "____*____", 
-            "*test_capturing_outerr.py:8: ValueError",
-            "*--- Captured stdout ---*",
-            "1",
-            "*--- Captured stderr ---*",
-            "2",
-        ])
 
     def test_showlocals(self, testdir): 
         p1 = testdir.makepyfile("""
diff --git a/py/test/testing/test_config.py b/py/test/testing/test_config.py
index 221508d43..8299aa6e3 100644
--- a/py/test/testing/test_config.py
+++ b/py/test/testing/test_config.py
@@ -212,38 +212,6 @@ class TestConfigApi_getcolitems:
         for col in col.listchain():
             assert col.config is config 
 
-
-class TestGuardedCall:
-    def test_guardedcall_ok(self, testdir):
-        config = testdir.parseconfig()
-        def myfunc(x):
-            print x
-            print >>py.std.sys.stderr, "hello"
-            return 7
-        call = config.guardedcall(lambda: myfunc(3))
-        assert call.excinfo is None
-        assert call.result == 7
-        assert call.stdout.startswith("3")
-        assert call.stderr.startswith("hello")
-
-    def test_guardedcall_fail(self, testdir):
-        config = testdir.parseconfig()
-        def myfunc(x):
-            print x
-            raise ValueError(17)
-        call = config.guardedcall(lambda: myfunc(3))
-        assert call.excinfo 
-        assert call.excinfo.type == ValueError 
-        assert not hasattr(call, 'result')
-        assert call.stdout.startswith("3")
-        assert not call.stderr 
-
-    def test_guardedcall_keyboardinterrupt(self, testdir):
-        config = testdir.parseconfig()
-        def myfunc():
-            raise KeyboardInterrupt
-        py.test.raises(KeyboardInterrupt, config.guardedcall, myfunc)
-
 class TestOptionEffects:
     def test_boxed_option_default(self, testdir):
         tmpdir = testdir.tmpdir.ensure("subdir", dir=1)
@@ -258,29 +226,6 @@ class TestOptionEffects:
         config = py.test.config._reparse([testdir.tmpdir])
         assert not config.option.boxed
 
-    def test_config_iocapturing(self, testdir):
-        config = testdir.parseconfig(testdir.tmpdir)
-        assert config.getvalue("iocapture")
-        tmpdir = testdir.tmpdir.ensure("sub-with-conftest", dir=1)
-        tmpdir.join("conftest.py").write(py.code.Source("""
-            pytest_option_iocapture = "no"
-        """))
-        config = py.test.config._reparse([tmpdir])
-        assert config.getvalue("iocapture") == "no"
-        capture = config._getcapture()
-        assert isinstance(capture, py.io.StdCapture)
-        assert not capture._out
-        assert not capture._err
-        assert not capture._in
-        assert isinstance(capture, py.io.StdCapture)
-        for opt, cls in (("sys", py.io.StdCapture),  
-                         ("fd", py.io.StdCaptureFD), 
-                        ):
-            config.option.iocapture = opt
-            capture = config._getcapture()
-            assert isinstance(capture, cls) 
-
-
 class TestConfig_gettopdir:
     def test_gettopdir(self, testdir):
         from py.__.test.config import gettopdir

From 9aa781907ede081e0623acd8c2051b3bf9df5ae9 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sat, 25 Jul 2009 18:45:04 +0200
Subject: [PATCH 04/15] enable capturing during collect

added a few xfailed tests for fixture reporting

--HG--
branch : 1.0.x
---
 py/test/defaultconftest.py         |  2 +-
 py/test/plugin/pytest_iocapture.py | 67 ++++++++++++------------------
 py/test/plugin/pytest_runner.py    |  1 -
 3 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/py/test/defaultconftest.py b/py/test/defaultconftest.py
index 91622956b..0bdcb6868 100644
--- a/py/test/defaultconftest.py
+++ b/py/test/defaultconftest.py
@@ -10,5 +10,5 @@ Generator = py.test.collect.Generator
 Function = py.test.collect.Function
 Instance = py.test.collect.Instance
 
-pytest_plugins = "default iocapture runner terminal keyword xfail tmpdir execnetcleanup monkeypatch recwarn pdb unittest".split()
+pytest_plugins = "default runner iocapture terminal keyword xfail tmpdir execnetcleanup monkeypatch recwarn pdb unittest".split()
 
diff --git a/py/test/plugin/pytest_iocapture.py b/py/test/plugin/pytest_iocapture.py
index 46c031090..5302d7743 100644
--- a/py/test/plugin/pytest_iocapture.py
+++ b/py/test/plugin/pytest_iocapture.py
@@ -34,10 +34,6 @@ def pytest_addoption(parser):
        action="store_true", dest="nocapture", default=False,
        help="disable catching of stdout/stderr during test run.")
 
-def pytest_configure(config):
-    if not config.option.nocapture:
-        config.pluginmanager.register(CapturePerTest())
-
 def determine_capturing(config, path=None):
     iocapture = config.getvalue("iocapture", path=path)
     if iocapture == "fd": 
@@ -50,6 +46,28 @@ def determine_capturing(config, path=None):
         # how to raise errors here? 
         raise config.Error("unknown io capturing: " + iocapture)
 
+def pytest_make_collect_report(__call__, collector):
+    cap = determine_capturing(collector.config, collector.fspath)
+    try:
+        rep = __call__.execute(firstresult=True)
+    finally:
+        outerr = cap.reset()
+    addouterr(rep, outerr)
+    return rep
+   
+def addouterr(rep, outerr):
+    repr = getattr(rep, 'longrepr', None)
+    if not hasattr(repr, 'addsection'):
+        return
+    for secname, content in zip(["out", "err"], outerr):
+        if content:
+            repr.addsection("Captured std%s" % secname, content.rstrip())
+
+def pytest_configure(config):
+    if not config.option.nocapture:
+        config.pluginmanager.register(CapturePerTest())
+
+
 class CapturePerTest:
     def __init__(self):
         self.item2capture = {}
@@ -78,12 +96,8 @@ class CapturePerTest:
         outerr = capture.reset()
         # XXX shift reporting elsewhere 
         rep = __call__.execute(firstresult=True)
-        if hasattr(rep, 'longrepr'):
-            repr = rep.longrepr
-            if hasattr(repr, 'addsection'):
-                for secname, content in zip(["out", "err"], outerr):
-                    if content:
-                        repr.addsection("Captured std%s" % secname, content.rstrip())
+        addouterr(rep, outerr)
+
         return rep
 
 def pytest_funcarg__capsys(request):
@@ -91,7 +105,7 @@ def pytest_funcarg__capsys(request):
     them available successively via a ``capsys.reset()`` method 
     which returns a ``(out, err)`` tuple of captured strings. 
     """ 
-    capture = Capture(py.io.StdCapture)
+    capture = CaptureFuncarg(py.io.StdCapture)
     request.addfinalizer(capture.finalize)
     return capture 
 
@@ -100,7 +114,7 @@ def pytest_funcarg__capfd(request):
     them available successively via a ``capsys.reset()`` method 
     which returns a ``(out, err)`` tuple of captured strings. 
     """ 
-    capture = Capture(py.io.StdCaptureFD)
+    capture = CaptureFuncarg(py.io.StdCaptureFD)
     request.addfinalizer(capture.finalize)
     return capture 
 
@@ -110,7 +124,7 @@ def pytest_pyfunc_call(pyfuncitem):
             if funcarg == "capsys" or funcarg == "capfd":
                 value.reset()
 
-class Capture: # funcarg
+class CaptureFuncarg:
     _capture = None
     def __init__(self, captureclass):
         self._captureclass = captureclass
@@ -126,30 +140,3 @@ class Capture: # funcarg
         self._capture = self._captureclass()
         return res 
 
-class TestCapture:
-    def test_std_functional(self, testdir):        
-        reprec = testdir.inline_runsource("""
-            def test_hello(capsys):
-                print 42
-                out, err = capsys.reset()
-                assert out.startswith("42")
-        """)
-        reprec.assertoutcome(passed=1)
-        
-    def test_stdfd_functional(self, testdir):        
-        reprec = testdir.inline_runsource("""
-            def test_hello(capfd):
-                import os
-                os.write(1, "42")
-                out, err = capfd.reset()
-                assert out.startswith("42")
-        """)
-        reprec.assertoutcome(passed=1)
-
-    def test_funcall_yielded_no_funcargs(self, testdir):        
-        reprec = testdir.inline_runsource("""
-            def test_hello():
-                yield lambda: None
-        """)
-        reprec.assertoutcome(passed=1)
-
diff --git a/py/test/plugin/pytest_runner.py b/py/test/plugin/pytest_runner.py
index c43fd14f4..96d34c420 100644
--- a/py/test/plugin/pytest_runner.py
+++ b/py/test/plugin/pytest_runner.py
@@ -31,7 +31,6 @@ def pytest_sessionfinish(session, exitstatus):
         mod.raiseExceptions = False 
 
 def pytest_make_collect_report(collector):
-    # XXX capturing is missing
     result = excinfo = None
     try:
         result = collector._memocollect()

From 5b205e07115473bd0cac23f57fea90c1be3b30bb Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 26 Jul 2009 15:31:23 +0200
Subject: [PATCH 05/15] improve assert re-inteprpretation for comparisons

--HG--
branch : 1.0.x
---
 CHANGELOG                         |  3 +++
 py/magic/exprinfo.py              |  6 ++++--
 py/magic/testing/test_exprinfo.py | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1ed977434..0538a5abe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 Changes between 1.0.0b8 and 1.0.0b9
 =====================================
 
+* make assert-reinterpretation work better with comparisons not 
+  returning bools (reported with numpy from thanks maciej fijalkowski)
+
 * reworked per-test output capturing into the pytest_iocapture.py plugin 
   and thus removed capturing code from config object 
 
diff --git a/py/magic/exprinfo.py b/py/magic/exprinfo.py
index 2161c52a7..369e759d5 100644
--- a/py/magic/exprinfo.py
+++ b/py/magic/exprinfo.py
@@ -122,6 +122,10 @@ class Compare(Interpretable):
         expr = Interpretable(self.expr)
         expr.eval(frame)
         for operation, expr2 in self.ops:
+            if hasattr(self, 'result'):
+                # shortcutting in chained expressions
+                if not frame.is_true(self.result):
+                    break
             expr2 = Interpretable(expr2)
             expr2.eval(frame)
             self.explanation = "%s %s %s" % (
@@ -135,8 +139,6 @@ class Compare(Interpretable):
                 raise
             except:
                 raise Failure(self)
-            if not frame.is_true(self.result):
-                break
             expr = expr2
 
 class And(Interpretable):
diff --git a/py/magic/testing/test_exprinfo.py b/py/magic/testing/test_exprinfo.py
index 636997745..666460e83 100644
--- a/py/magic/testing/test_exprinfo.py
+++ b/py/magic/testing/test_exprinfo.py
@@ -131,3 +131,26 @@ def test_inconsistent_assert_result(testdir):
     s = result.stdout.str()
     assert s.find("re-run") != -1
 
+def test_twoarg_comparison_does_not_call_nonzero():
+    # this arises e.g. in numpy array comparisons 
+    class X(object):
+        def __eq__(self, other):
+            return self
+
+        def __nonzero__(self):
+            raise ValueError
+
+        def all(self):
+            return False
+
+    def f():
+        a = X()
+        b = X()
+        assert (a == b).all()
+
+    excinfo = getexcinfo(AssertionError, f)
+    msg = getmsg(excinfo)
+    print msg
+    assert "re-run" not in msg
+    assert "ValueError" not in msg
+

From dcf194ebb8877da46af6fc97ce494e64dd1f766e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 28 Jul 2009 14:26:32 +0200
Subject: [PATCH 06/15] simplify py.test.mark API, add more plugin docs

--HG--
branch : 1.0.x
---
 CHANGELOG                        |   2 +
 doc/test/features.txt            |   8 ++-
 doc/test/plugin/hooklog.txt      |  35 +++++++++
 doc/test/plugin/keyword.txt      |  50 +++++++++++++
 doc/test/plugin/pdb.txt          |  35 +++++++++
 makepluginlist.py                |   2 +
 py/test/plugin/pytest_keyword.py | 120 +++++++++++++++++--------------
 7 files changed, 198 insertions(+), 54 deletions(-)
 create mode 100644 doc/test/plugin/hooklog.txt
 create mode 100644 doc/test/plugin/keyword.txt
 create mode 100644 doc/test/plugin/pdb.txt

diff --git a/CHANGELOG b/CHANGELOG
index 0538a5abe..14f888746 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Changes between 1.0.0b8 and 1.0.0b9
 =====================================
 
+* simplified py.test.mark API 
+
 * make assert-reinterpretation work better with comparisons not 
   returning bools (reported with numpy from thanks maciej fijalkowski)
 
diff --git a/doc/test/features.txt b/doc/test/features.txt
index d7a71783d..2cfa5b384 100644
--- a/doc/test/features.txt
+++ b/doc/test/features.txt
@@ -237,11 +237,15 @@ class/function names of a test function are put into the set
 of keywords for a given test.  You can specify additional 
 kewords like this::
 
-    @py.test.mark(webtest=True)
+    @py.test.mark.webtest 
     def test_send_http():
         ... 
 
-and then use those keywords to select tests. 
+and then use those keywords to select tests.  See the `pytest_keyword`_
+plugin for more information. 
+
+.. _`pytest_keyword`: plugin/keyword.html
+
 
 disabling a test class
 ---------------------- 
diff --git a/doc/test/plugin/hooklog.txt b/doc/test/plugin/hooklog.txt
new file mode 100644
index 000000000..371e07070
--- /dev/null
+++ b/doc/test/plugin/hooklog.txt
@@ -0,0 +1,35 @@
+
+pytest_hooklog plugin
+=====================
+
+log invocations of extension hooks to a file.
+
+.. contents::
+  :local:
+
+
+
+command line options
+--------------------
+
+
+``--hooklog=HOOKLOG``
+    write hook calls to the given file.
+
+Start improving this plugin in 30 seconds
+=========================================
+
+
+Do you find the above documentation or the plugin itself lacking? 
+
+1. Download `pytest_hooklog.py`_ plugin source code 
+2. put it somewhere as ``pytest_hooklog.py`` into your import path 
+3. a subsequent ``py.test`` run will use your local version
+
+Further information: extend_ documentation, other plugins_ or contact_.  
+
+.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/2b8d56b82ce6966960cf41d38dc2b794797912ba/py/test/plugin/pytest_hooklog.py
+.. _`extend`: ../extend.html
+.. _`plugins`: index.html
+.. _`contact`: ../../contact.html
+.. _`checkout the py.test development version`: ../../download.html#checkout
diff --git a/doc/test/plugin/keyword.txt b/doc/test/plugin/keyword.txt
new file mode 100644
index 000000000..28d7486af
--- /dev/null
+++ b/doc/test/plugin/keyword.txt
@@ -0,0 +1,50 @@
+
+pytest_keyword plugin
+=====================
+
+mark test functions with keywords that may hold values.
+
+.. contents::
+  :local:
+
+Marking functions and setting rich attributes
+----------------------------------------------------
+
+By default, all filename parts and class/function names of a test
+function are put into the set of keywords for a given test.  You can
+specify additional kewords like this::
+
+    @py.test.mark.webtest 
+    def test_send_http():
+        ... 
+
+This will set an attribute 'webtest' on the given test function
+and by default all such attributes signal keywords.  You can 
+also set values in this attribute which you could read from
+a hook in order to do something special with respect to
+the test function::
+
+    @py.test.mark.timeout(seconds=5)
+    def test_receive():
+        ...
+
+This will set the "timeout" attribute with a Marker object 
+that has a 'seconds' attribute.
+
+Start improving this plugin in 30 seconds
+=========================================
+
+
+Do you find the above documentation or the plugin itself lacking? 
+
+1. Download `pytest_keyword.py`_ plugin source code 
+2. put it somewhere as ``pytest_keyword.py`` into your import path 
+3. a subsequent ``py.test`` run will use your local version
+
+Further information: extend_ documentation, other plugins_ or contact_.  
+
+.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/2b8d56b82ce6966960cf41d38dc2b794797912ba/py/test/plugin/pytest_keyword.py
+.. _`extend`: ../extend.html
+.. _`plugins`: index.html
+.. _`contact`: ../../contact.html
+.. _`checkout the py.test development version`: ../../download.html#checkout
diff --git a/doc/test/plugin/pdb.txt b/doc/test/plugin/pdb.txt
new file mode 100644
index 000000000..2cb084b43
--- /dev/null
+++ b/doc/test/plugin/pdb.txt
@@ -0,0 +1,35 @@
+
+pytest_pdb plugin
+=================
+
+interactive debugging with the Python Debugger.
+
+.. contents::
+  :local:
+
+
+
+command line options
+--------------------
+
+
+``--pdb``
+    start pdb (the Python debugger) on errors.
+
+Start improving this plugin in 30 seconds
+=========================================
+
+
+Do you find the above documentation or the plugin itself lacking? 
+
+1. Download `pytest_pdb.py`_ plugin source code 
+2. put it somewhere as ``pytest_pdb.py`` into your import path 
+3. a subsequent ``py.test`` run will use your local version
+
+Further information: extend_ documentation, other plugins_ or contact_.  
+
+.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/2b8d56b82ce6966960cf41d38dc2b794797912ba/py/test/plugin/pytest_pdb.py
+.. _`extend`: ../extend.html
+.. _`plugins`: index.html
+.. _`contact`: ../../contact.html
+.. _`checkout the py.test development version`: ../../download.html#checkout
diff --git a/makepluginlist.py b/makepluginlist.py
index 153c2409b..d88c9584b 100644
--- a/makepluginlist.py
+++ b/makepluginlist.py
@@ -10,6 +10,8 @@ plugins = [
             'unittest doctest oejskit restdoc'),
     ('Plugins for generic reporting and failure logging', 
             'pocoo resultlog terminal',),
+    ('internal plugins / core functionality', 
+        'pdb keyword hooklog')
     #('internal plugins / core functionality', 
     #    #'pdb keyword hooklog runner execnetcleanup # pytester',
     #    'pdb keyword hooklog runner execnetcleanup' # pytester',
diff --git a/py/test/plugin/pytest_keyword.py b/py/test/plugin/pytest_keyword.py
index 61c134a01..656b16ef9 100644
--- a/py/test/plugin/pytest_keyword.py
+++ b/py/test/plugin/pytest_keyword.py
@@ -1,70 +1,86 @@
 """
-    py.test.mark / keyword plugin 
+mark test functions with keywords that may hold values. 
+
+Marking functions and setting rich attributes
+----------------------------------------------------
+
+By default, all filename parts and class/function names of a test
+function are put into the set of keywords for a given test.  You can
+specify additional kewords like this::
+
+    @py.test.mark.webtest 
+    def test_send_http():
+        ... 
+
+This will set an attribute 'webtest' on the given test function
+and by default all such attributes signal keywords.  You can 
+also set values in this attribute which you could read from
+a hook in order to do something special with respect to
+the test function::
+
+    @py.test.mark.timeout(seconds=5)
+    def test_receive():
+        ...
+
+This will set the "timeout" attribute with a Marker object 
+that has a 'seconds' attribute. 
+
 """
 import py
 
 def pytest_namespace():
-    mark = KeywordDecorator({})
-    return {'mark': mark}
+    return {'mark': Mark()}
 
-class KeywordDecorator:
-    """ decorator for setting function attributes. """
-    def __init__(self, keywords, lastname=None):
-        self._keywords = keywords
-        self._lastname = lastname
-
-    def __call__(self, func=None, **kwargs):
-        if func is None:
-            kw = self._keywords.copy()
-            kw.update(kwargs)
-            return KeywordDecorator(kw)
-        elif not hasattr(func, 'func_dict'):
-            kw = self._keywords.copy()
-            name = self._lastname
-            if name is None:
-                name = "mark"
-            kw[name] = func
-            return KeywordDecorator(kw)
-        func.func_dict.update(self._keywords)
-        return func 
 
+class Mark(object):
     def __getattr__(self, name):
         if name[0] == "_":
             raise AttributeError(name)
-        kw = self._keywords.copy()
-        kw[name] = True
-        return self.__class__(kw, lastname=name)
+        return MarkerDecorator(name)
+
+class MarkerDecorator:
+    """ decorator for setting function attributes. """
+    def __init__(self, name):
+        self.markname = name
+
+    def __repr__(self):
+        d = self.__dict__.copy()
+        name = d.pop('markname')
+        return "<MarkerDecorator %r %r>" %(name, d)
+
+    def __call__(self, *args, **kwargs):
+        if not args:
+            if hasattr(self, 'kwargs'):
+                raise TypeError("double mark-keywords?") 
+            self.kwargs = kwargs.copy()
+            return self 
+        else:
+            if not len(args) == 1 or not hasattr(args[0], 'func_dict'):
+                raise TypeError("need exactly one function to decorate, "
+                                "got %r" %(args,))
+            func = args[0]
+            mh = MarkHolder(getattr(self, 'kwargs', {}))
+            setattr(func, self.markname, mh)
+            return func
+
+class MarkHolder:
+    def __init__(self, kwargs):
+        self.__dict__.update(kwargs)
+
+def test_pytest_mark_api():
+    mark = Mark()
+    py.test.raises(TypeError, "mark(x=3)")
 
-def test_pytest_mark_getattr():
-    mark = KeywordDecorator({})
     def f(): pass
-
     mark.hello(f)
-    assert f.hello == True
+    assert f.hello
 
-    mark.hello("test")(f)
-    assert f.hello == "test"
+    mark.world(x=3, y=4)(f)
+    assert f.world 
+    assert f.world.x == 3
+    assert f.world.y == 4
 
-    py.test.raises(AttributeError, "mark._hello")
-    py.test.raises(AttributeError, "mark.__str__")
-
-def test_pytest_mark_call():
-    mark = KeywordDecorator({})
-    def f(): pass
-    mark(x=3)(f)
-    assert f.x == 3
-    def g(): pass
-    mark(g)
-    assert not g.func_dict
-
-    mark.hello(f)
-    assert f.hello == True
-
-    mark.hello("test")(f)
-    assert f.hello == "test"
-
-    mark("x1")(f)
-    assert f.mark == "x1"
+    py.test.raises(TypeError, "mark.some(x=3)(f=5)")
 
 def test_mark_plugin(testdir):
     p = testdir.makepyfile("""

From ad34e50b71da322c16ed13abd4b3d6dab05f1638 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 30 Jul 2009 09:52:12 +0200
Subject: [PATCH 07/15] properly handle test items that get locally collected
 but cannot be collected on the remote side (often due to platform reasons)

--HG--
branch : 1.0.x
---
 CHANGELOG                             |  6 +++++-
 py/test/collect.py                    |  6 +++++-
 py/test/dist/testing/test_dsession.py | 28 +++++++++++++++++---------
 py/test/dist/txnode.py                | 29 +++++++++++++++++++++++++--
 py/test/plugin/pytest_pytester.py     |  7 ++++++-
 5 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 14f888746..3b36188d5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,11 @@
 Changes between 1.0.0b8 and 1.0.0b9
 =====================================
 
-* simplified py.test.mark API 
+* dist-testing: properly handle test items that get locally 
+  collected but cannot be collected on the remote side - often 
+  due to platform/dependency reasons
+
+* simplified py.test.mark API - see keyword plugin documentation
 
 * make assert-reinterpretation work better with comparisons not 
   returning bools (reported with numpy from thanks maciej fijalkowski)
diff --git a/py/test/collect.py b/py/test/collect.py
index c7bbdb556..eb941a712 100644
--- a/py/test/collect.py
+++ b/py/test/collect.py
@@ -4,7 +4,6 @@ Collectors and test Items form a tree
 that is usually built iteratively.  
 """ 
 import py
-from py.__.test.outcome import Skipped
 
 def configproperty(name):
     def fget(self):
@@ -31,6 +30,10 @@ class Node(object):
         self.config = getattr(parent, 'config', None)
         self.fspath = getattr(parent, 'fspath', None) 
 
+    def _checkcollectable(self):
+        if not hasattr(self, 'fspath'):
+            self.parent._memocollect() # to reraise exception
+            
     # 
     # note to myself: Pickling is uh.
     # 
@@ -44,6 +47,7 @@ class Node(object):
         except Exception:
             # seems our parent can't collect us 
             # so let's be somewhat operable 
+            # _checkcollectable() is to tell outsiders about the fact
             self.name = name 
             self.parent = parent 
             self.config = parent.config
diff --git a/py/test/dist/testing/test_dsession.py b/py/test/dist/testing/test_dsession.py
index ec33526cc..5c2b1afd2 100644
--- a/py/test/dist/testing/test_dsession.py
+++ b/py/test/dist/testing/test_dsession.py
@@ -367,13 +367,21 @@ class TestDSession:
         assert node.gateway.spec.popen
         #XXX eq.geteventargs("pytest_sessionfinish")
 
-    @py.test.mark.xfail
-    def test_collected_function_causes_remote_skip_at_module_level(self, testdir):
-        p = testdir.makepyfile("""
-            import py
-            py.test.importorskip("xyz")
-            def test_func():
-                pass
-        """)
-        # we need to be able to collect test_func locally but not in the subprocess 
-        XXX
+def test_collected_function_causes_remote_skip(testdir):
+    sub = testdir.mkpydir("testing")
+    sub.join("test_module.py").write(py.code.Source("""
+        import py
+        path = py.path.local(%r)
+        if path.check():
+            path.remove()
+        else:
+            py.test.skip("remote skip")
+        def test_func(): 
+            pass
+        def test_func2(): 
+            pass
+    """ % str(sub.ensure("somefile"))))
+    result = testdir.runpytest('-v', '--dist=each', '--tx=popen')
+    result.stdout.fnmatch_lines([
+        "*2 skipped*"
+    ])
diff --git a/py/test/dist/txnode.py b/py/test/dist/txnode.py
index d7633e80e..513772947 100644
--- a/py/test/dist/txnode.py
+++ b/py/test/dist/txnode.py
@@ -124,12 +124,37 @@ class SlaveNode(object):
                     break
                 if isinstance(task, list):
                     for item in task:
-                        item.config.hook.pytest_runtest_protocol(item=item) 
+                        self.run_single(item=item)
                 else:
-                    task.config.hook.pytest_runtest_protocol(item=task) 
+                    self.run_single(item=task)
         except KeyboardInterrupt:
             raise
         except:
             er = py.code.ExceptionInfo().getrepr(funcargs=True, showlocals=True)
             self.sendevent("pytest_internalerror", excrepr=er)
             raise
+
+    def run_single(self, item):
+        call = CallInfo(item._checkcollectable, 'setup')
+        if call.excinfo:
+            # likely it is not collectable here because of
+            # platform/import-dependency induced skips 
+            # XXX somewhat ugly shortcuts - also makes a collection
+            #     failure into an ItemTestReport - this might confuse
+            #     pytest_runtest_logreport hooks 
+            runner = item.config.pluginmanager.getplugin("pytest_runner")
+            rep = runner.pytest_runtest_makereport(item=item, call=call)
+            self.pytest_runtest_logreport(rep)
+            return
+        item.config.hook.pytest_runtest_protocol(item=item) 
+
+class CallInfo:
+    excinfo = None 
+    def __init__(self, func, when):
+        self.when = when 
+        try:
+            self.result = func()
+        except KeyboardInterrupt:
+            raise
+        except:
+            self.excinfo = py.code.ExceptionInfo()
diff --git a/py/test/plugin/pytest_pytester.py b/py/test/plugin/pytest_pytester.py
index 0a0ba4c00..f022df147 100644
--- a/py/test/plugin/pytest_pytester.py
+++ b/py/test/plugin/pytest_pytester.py
@@ -129,7 +129,12 @@ class TmpTestdir:
             
     def mkdir(self, name):
         return self.tmpdir.mkdir(name)
-    
+
+    def mkpydir(self, name):
+        p = self.mkdir(name)
+        p.ensure("__init__.py")
+        return p
+
     def genitems(self, colitems):
         return list(self.session.genitems(colitems))
 

From 2514b8faafff507be2c4e2b46c1638a292703289 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 30 Jul 2009 21:31:31 +0200
Subject: [PATCH 08/15] fix a svn-1.6 issue

--HG--
branch : 1.0.x
---
 CHANGELOG                | 3 +++
 py/path/svn/wccommand.py | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3b36188d5..eb1270d92 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 Changes between 1.0.0b8 and 1.0.0b9
 =====================================
 
+* fix svn-1.6 compat issue with py.path.svnwc().versioned()
+  (thanks Wouter Vanden Hove)
+
 * dist-testing: properly handle test items that get locally 
   collected but cannot be collected on the remote side - often 
   due to platform/dependency reasons
diff --git a/py/path/svn/wccommand.py b/py/path/svn/wccommand.py
index 558d32cb5..ae6245160 100644
--- a/py/path/svn/wccommand.py
+++ b/py/path/svn/wccommand.py
@@ -454,6 +454,8 @@ recursively. """
             except py.process.cmdexec.Error, e:
                 if e.err.find('is not a working copy')!=-1:
                     return False
+                if e.err.lower().find('not a versioned resource') != -1:
+                    return False
                 raise
             else:
                 return True 

From be949f40375662a492a670627233e135bff2906e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 31 Jul 2009 14:21:02 +0200
Subject: [PATCH 09/15] * reworked capturing to only capture once per runtest
 cycle * added readouterr() method to py.io capturing helpers

--HG--
branch : 1.0.x
---
 CHANGELOG                               |   7 +
 MANIFEST                                |   1 +
 doc/test/plugin/doctest.txt             |   2 +-
 doc/test/plugin/figleaf.txt             |   2 +-
 doc/test/plugin/hooklog.txt             |   2 +-
 doc/test/plugin/index.txt               |  15 +-
 doc/test/plugin/iocapture.txt           |  99 +++++--
 doc/test/plugin/keyword.txt             |   2 +-
 doc/test/plugin/monkeypatch.txt         |   2 +-
 doc/test/plugin/pdb.txt                 |   2 +-
 doc/test/plugin/pocoo.txt               |   2 +-
 doc/test/plugin/recwarn.txt             |   2 +-
 doc/test/plugin/restdoc.txt             |   2 +-
 doc/test/plugin/resultlog.txt           |   2 +-
 doc/test/plugin/terminal.txt            |   2 +-
 doc/test/plugin/unittest.txt            |   2 +-
 doc/test/plugin/xfail.txt               |   2 +-
 py/conftest.py                          |  10 +
 py/io/stdcapture.py                     | 128 +++++++--
 py/io/testing/test_stdcapture.py        |  43 ++-
 py/test/defaultconftest.py              |   1 +
 py/test/plugin/pytest_default.py        |   3 -
 py/test/plugin/pytest_iocapture.py      | 266 +++++++++++------
 py/test/plugin/pytest_pdb.py            |   7 +
 py/test/plugin/pytest_pytester.py       |  13 +-
 py/test/plugin/pytest_terminal.py       |   3 +-
 py/test/plugin/test_pytest_iocapture.py | 363 ++++++++++++++++++++++++
 py/test/testing/test_install.py         |  21 +-
 py/test/testing/test_parseopt.py        |   4 +-
 29 files changed, 842 insertions(+), 168 deletions(-)
 create mode 100644 py/test/plugin/test_pytest_iocapture.py

diff --git a/CHANGELOG b/CHANGELOG
index eb1270d92..9368d7a95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,13 @@ Changes between 1.0.0b8 and 1.0.0b9
 
 * simplified py.test.mark API - see keyword plugin documentation
 
+* integrate better with logging: capturing now by default captures
+  test functions and their immediate setup/teardown in a single stream 
+
+* capsys and capfd funcargs now have a readouterr() and a close() method
+  (underlyingly py.io.StdCapture/FD objects are used which grew a 
+  readouterr() method as well to return snapshots of captured out/err)
+
 * make assert-reinterpretation work better with comparisons not 
   returning bools (reported with numpy from thanks maciej fijalkowski)
 
diff --git a/MANIFEST b/MANIFEST
index 623f802bf..1a2c689ec 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -351,6 +351,7 @@ py/test/plugin/pytest_terminal.py
 py/test/plugin/pytest_tmpdir.py
 py/test/plugin/pytest_unittest.py
 py/test/plugin/pytest_xfail.py
+py/test/plugin/test_pytest_iocapture.py
 py/test/plugin/test_pytest_runner.py
 py/test/plugin/test_pytest_runner_xunit.py
 py/test/plugin/test_pytest_terminal.py
diff --git a/doc/test/plugin/doctest.txt b/doc/test/plugin/doctest.txt
index 570f54cce..fd4fb8f90 100644
--- a/doc/test/plugin/doctest.txt
+++ b/doc/test/plugin/doctest.txt
@@ -37,7 +37,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_doctest.py
+.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_doctest.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/figleaf.txt b/doc/test/plugin/figleaf.txt
index fa2c73751..e48be57ce 100644
--- a/doc/test/plugin/figleaf.txt
+++ b/doc/test/plugin/figleaf.txt
@@ -32,7 +32,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_figleaf.py
+.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_figleaf.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/hooklog.txt b/doc/test/plugin/hooklog.txt
index 371e07070..270b5bb02 100644
--- a/doc/test/plugin/hooklog.txt
+++ b/doc/test/plugin/hooklog.txt
@@ -28,7 +28,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/2b8d56b82ce6966960cf41d38dc2b794797912ba/py/test/plugin/pytest_hooklog.py
+.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_hooklog.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/index.txt b/doc/test/plugin/index.txt
index cb586913d..4c8ea9615 100644
--- a/doc/test/plugin/index.txt
+++ b/doc/test/plugin/index.txt
@@ -8,7 +8,7 @@ figleaf_ write and report coverage data with 'figleaf'.
 
 monkeypatch_ safely patch object attributes, dicts and environment variables.
 
-iocapture_ convenient capturing of writes to stdout/stderror streams and file descriptors.
+iocapture_ configurable per-test stdout/stderr capturing mechanisms.
 
 recwarn_ helpers for asserting deprecation and other warnings.
 
@@ -35,6 +35,16 @@ resultlog_ resultlog plugin for machine-readable logging of test results.
 terminal_ Implements terminal reporting of the full testing process.
 
 
+internal plugins / core functionality
+=====================================
+
+pdb_ interactive debugging with the Python Debugger.
+
+keyword_ mark test functions with keywords that may hold values.
+
+hooklog_ log invocations of extension hooks to a file.
+
+
 .. _`xfail`: xfail.html
 .. _`figleaf`: figleaf.html
 .. _`monkeypatch`: monkeypatch.html
@@ -47,3 +57,6 @@ terminal_ Implements terminal reporting of the full testing process.
 .. _`pocoo`: pocoo.html
 .. _`resultlog`: resultlog.html
 .. _`terminal`: terminal.html
+.. _`pdb`: pdb.html
+.. _`keyword`: keyword.html
+.. _`hooklog`: hooklog.html
diff --git a/doc/test/plugin/iocapture.txt b/doc/test/plugin/iocapture.txt
index 724529713..7aefb0420 100644
--- a/doc/test/plugin/iocapture.txt
+++ b/doc/test/plugin/iocapture.txt
@@ -2,34 +2,90 @@
 pytest_iocapture plugin
 =======================
 
-convenient capturing of writes to stdout/stderror streams and file descriptors.
+configurable per-test stdout/stderr capturing mechanisms.
 
 .. contents::
   :local:
 
-Example Usage
-----------------------
+This plugin captures stdout/stderr output for each test separately. 
+In case of test failures this captured output is shown grouped 
+togtther with the test. 
 
-You can use the `capsys funcarg`_ to capture writes 
-to stdout and stderr streams by using it in a test 
-likes this:
+The plugin also provides test function arguments that help to
+assert stdout/stderr output from within your tests, see the 
+`funcarg example`_. 
+
+
+Capturing of input/output streams during tests 
+---------------------------------------------------
+
+By default ``sys.stdout`` and ``sys.stderr`` are substituted with
+temporary streams during the execution of tests and setup/teardown code.  
+During the whole testing process it will re-use the same temporary 
+streams allowing to play well with the logging module which easily
+takes ownership on these streams. 
+
+Also, 'sys.stdin' is substituted with a file-like "null" object that 
+does not return any values.  This is to immediately error out
+on tests that wait on reading something from stdin. 
+
+You can influence output capturing mechanisms from the command line::
+
+    py.test -s            # disable all capturing
+    py.test --capture=sys # set StringIO() to each of sys.stdout/stderr 
+    py.test --capture=fd  # capture stdout/stderr on Filedescriptors 1/2 
+
+If you set capturing values in a conftest file like this::
+
+    # conftest.py
+    conf_capture = 'fd'
+
+then all tests in that directory will execute with "fd" style capturing. 
+
+sys-level capturing 
+------------------------------------------
+
+Capturing on 'sys' level means that ``sys.stdout`` and ``sys.stderr`` 
+will be replaced with StringIO() objects.   
+
+FD-level capturing and subprocesses
+------------------------------------------
+
+The ``fd`` based method means that writes going to system level files
+based on the standard file descriptors will be captured, for example 
+writes such as ``os.write(1, 'hello')`` will be captured properly. 
+Capturing on fd-level will include output generated from 
+any subprocesses created during a test. 
+
+.. _`funcarg example`:
+
+Example Usage of the capturing Function arguments
+---------------------------------------------------
+
+You can use the `capsys funcarg`_ and `capfd funcarg`_ to 
+capture writes to stdout and stderr streams.  Using the
+funcargs frees your test from having to care about setting/resetting 
+the old streams and also interacts well with py.test's own 
+per-test capturing.  Here is an example test function:
 
 .. sourcecode:: python
 
     def test_myoutput(capsys):
         print "hello" 
         print >>sys.stderr, "world"
-        out, err = capsys.reset()
+        out, err = capsys.readouterr()
         assert out == "hello\n"
         assert err == "world\n"
         print "next"
-        out, err = capsys.reset()
+        out, err = capsys.readouterr()
         assert out == "next\n" 
 
-The ``reset()`` call returns a tuple and will restart 
-capturing so that you can successively check for output. 
-After the test function finishes the original streams
-will be restored.
+The ``readouterr()`` call snapshots the output so far - 
+and capturing will be continued.  After the test 
+function finishes the original streams will 
+be restored.  If you want to capture on 
+the filedescriptor level you can use the ``capfd`` function
+argument which offers the same interface.
 
 .. _`capsys funcarg`:
 
@@ -38,8 +94,8 @@ the 'capsys' test function argument
 -----------------------------------
 
 captures writes to sys.stdout/sys.stderr and makes 
-them available successively via a ``capsys.reset()`` method 
-which returns a ``(out, err)`` tuple of captured strings. 
+them available successively via a ``capsys.readouterr()`` method 
+which returns a ``(out, err)`` tuple of captured snapshot strings. 
 
 .. _`capfd funcarg`:
 
@@ -48,8 +104,17 @@ the 'capfd' test function argument
 ----------------------------------
 
 captures writes to file descriptors 1 and 2 and makes 
-them available successively via a ``capsys.reset()`` method 
-which returns a ``(out, err)`` tuple of captured strings. 
+snapshotted ``(out, err)`` string tuples available 
+via the ``capsys.readouterr()`` method. 
+
+command line options
+--------------------
+
+
+``-s``
+    shortcut for --capture=no.
+``--capture=capture``
+    set IO capturing method during tests: sys|fd|no.
 
 Start improving this plugin in 30 seconds
 =========================================
@@ -63,7 +128,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_iocapture.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_iocapture.py
+.. _`pytest_iocapture.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_iocapture.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/keyword.txt b/doc/test/plugin/keyword.txt
index 28d7486af..e6e640f9d 100644
--- a/doc/test/plugin/keyword.txt
+++ b/doc/test/plugin/keyword.txt
@@ -43,7 +43,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/2b8d56b82ce6966960cf41d38dc2b794797912ba/py/test/plugin/pytest_keyword.py
+.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_keyword.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/monkeypatch.txt b/doc/test/plugin/monkeypatch.txt
index 2a4c509bf..0d3e37528 100644
--- a/doc/test/plugin/monkeypatch.txt
+++ b/doc/test/plugin/monkeypatch.txt
@@ -58,7 +58,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_monkeypatch.py
+.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_monkeypatch.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/pdb.txt b/doc/test/plugin/pdb.txt
index 2cb084b43..26eefdca4 100644
--- a/doc/test/plugin/pdb.txt
+++ b/doc/test/plugin/pdb.txt
@@ -28,7 +28,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/2b8d56b82ce6966960cf41d38dc2b794797912ba/py/test/plugin/pytest_pdb.py
+.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_pdb.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/pocoo.txt b/doc/test/plugin/pocoo.txt
index 159193e75..187cb72de 100644
--- a/doc/test/plugin/pocoo.txt
+++ b/doc/test/plugin/pocoo.txt
@@ -28,7 +28,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_pocoo.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_pocoo.py
+.. _`pytest_pocoo.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_pocoo.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/recwarn.txt b/doc/test/plugin/recwarn.txt
index fe902a89f..40da066ce 100644
--- a/doc/test/plugin/recwarn.txt
+++ b/doc/test/plugin/recwarn.txt
@@ -58,7 +58,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_recwarn.py
+.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_recwarn.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/restdoc.txt b/doc/test/plugin/restdoc.txt
index f3d5d7ea5..423c000ff 100644
--- a/doc/test/plugin/restdoc.txt
+++ b/doc/test/plugin/restdoc.txt
@@ -32,7 +32,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_restdoc.py
+.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_restdoc.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/resultlog.txt b/doc/test/plugin/resultlog.txt
index df33b9bd6..0b0276088 100644
--- a/doc/test/plugin/resultlog.txt
+++ b/doc/test/plugin/resultlog.txt
@@ -28,7 +28,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_resultlog.py
+.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_resultlog.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/terminal.txt b/doc/test/plugin/terminal.txt
index 367aea277..a298cb8b0 100644
--- a/doc/test/plugin/terminal.txt
+++ b/doc/test/plugin/terminal.txt
@@ -21,7 +21,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_terminal.py
+.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_terminal.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/unittest.txt b/doc/test/plugin/unittest.txt
index 3c193087f..857279d2d 100644
--- a/doc/test/plugin/unittest.txt
+++ b/doc/test/plugin/unittest.txt
@@ -31,7 +31,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_unittest.py
+.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_unittest.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/doc/test/plugin/xfail.txt b/doc/test/plugin/xfail.txt
index c203d4963..48bd01abc 100644
--- a/doc/test/plugin/xfail.txt
+++ b/doc/test/plugin/xfail.txt
@@ -33,7 +33,7 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/85fe614ab05f301f206935d11a477df184cbbce6/py/test/plugin/pytest_xfail.py
+.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_xfail.py
 .. _`extend`: ../extend.html
 .. _`plugins`: index.html
 .. _`contact`: ../../contact.html
diff --git a/py/conftest.py b/py/conftest.py
index 11e8b1e1a..058de7b8e 100644
--- a/py/conftest.py
+++ b/py/conftest.py
@@ -43,3 +43,13 @@ def getsocketspec(config=None):
         if spec.socket:
             return spec
     py.test.skip("need '--gx socket=...'")
+
+
+def pytest_generate_tests(metafunc):
+    multi = getattr(metafunc.function, 'multi', None)
+    if multi is None:
+        return
+    assert len(multi.__dict__) == 1
+    for name, l in multi.__dict__.items():
+        for val in l:
+            metafunc.addcall(funcargs={name: val})
diff --git a/py/io/stdcapture.py b/py/io/stdcapture.py
index a43d4bf0e..f5f60fe82 100644
--- a/py/io/stdcapture.py
+++ b/py/io/stdcapture.py
@@ -21,22 +21,53 @@ class Capture(object):
         return res, out, err 
     call = classmethod(call) 
 
-    def reset(self): 
-        """ reset sys.stdout and sys.stderr and return captured output 
-            as strings and restore sys.stdout/err.
-        """
-        x, y = self.done() 
-        outerr = x.read(), y.read() 
-        x.close()
-        y.close()
+    def reset(self):
+        """ reset sys.stdout/stderr and return captured output as strings. """
+        if hasattr(self, '_suspended'):
+            outfile = self._kwargs['out']
+            errfile = self._kwargs['err']
+            del self._kwargs
+        else:
+            outfile, errfile = self.done() 
+        out, err = "", ""
+        if outfile:
+            out = outfile.read()
+            outfile.close()
+        if errfile and errfile != outfile:
+            err = errfile.read()
+            errfile.close()
+        return out, err
+
+    def suspend(self):
+        """ return current snapshot captures, memorize tempfiles. """
+        assert not hasattr(self, '_suspended')
+        self._suspended = True
+        outerr = self.readouterr()
+        outfile, errfile = self.done()
+        self._kwargs['out'] = outfile
+        self._kwargs['err'] = errfile
         return outerr
 
+    def resume(self):
+        """ resume capturing with original temp files. """
+        assert self._suspended
+        self._initialize(**self._kwargs)
+        del self._suspended
+
+
 class StdCaptureFD(Capture): 
     """ This class allows to capture writes to FD1 and FD2 
         and may connect a NULL file to FD0 (and prevent
         reads from sys.stdin)
     """
-    def __init__(self, out=True, err=True, mixed=False, in_=True, patchsys=True): 
+    def __init__(self, out=True, err=True, 
+                 mixed=False, in_=True, patchsys=True): 
+        self._kwargs = locals().copy()
+        del self._kwargs['self']
+        self._initialize(**self._kwargs)
+
+    def _initialize(self, out=True, err=True, 
+                    mixed=False, in_=True, patchsys=True): 
         if in_:
             self._oldin = (sys.stdin, os.dup(0))
             sys.stdin  = DontReadFromInput()
@@ -44,14 +75,19 @@ class StdCaptureFD(Capture):
             os.dup2(fd, 0)
             os.close(fd)
         if out: 
-            self.out = py.io.FDCapture(1) 
+            tmpfile = None
+            if isinstance(out, file):
+                tmpfile = out
+            self.out = py.io.FDCapture(1, tmpfile=tmpfile)
             if patchsys: 
                 self.out.setasfile('stdout')
         if err: 
             if mixed and out:
                 tmpfile = self.out.tmpfile 
+            elif isinstance(err, file):
+                tmpfile = err
             else:
-                tmpfile = None    
+                tmpfile = None
             self.err = py.io.FDCapture(2, tmpfile=tmpfile) 
             if patchsys: 
                 self.err.setasfile('stderr')
@@ -61,11 +97,11 @@ class StdCaptureFD(Capture):
         if hasattr(self, 'out'): 
             outfile = self.out.done() 
         else:
-            outfile = StringIO()
+            outfile = None
         if hasattr(self, 'err'): 
             errfile = self.err.done() 
         else:
-            errfile = StringIO()
+            errfile = None 
         if hasattr(self, '_oldin'):
             oldsys, oldfd = self._oldin 
             os.dup2(oldfd, 0)
@@ -73,6 +109,20 @@ class StdCaptureFD(Capture):
             sys.stdin = oldsys 
         return outfile, errfile 
 
+    def readouterr(self):
+        """ return snapshot value of stdout/stderr capturings. """
+        l = []
+        for name in ('out', 'err'):
+            res = ""
+            if hasattr(self, name):
+                f = getattr(self, name).tmpfile
+                f.seek(0)
+                res = f.read()
+                f.truncate(0)
+                f.seek(0)
+            l.append(res)
+        return l 
+
 class StdCapture(Capture):
     """ This class allows to capture writes to sys.stdout|stderr "in-memory"
         and will raise errors on tries to read from sys.stdin. It only
@@ -80,21 +130,28 @@ class StdCapture(Capture):
         touch underlying File Descriptors (use StdCaptureFD for that). 
     """
     def __init__(self, out=True, err=True, in_=True, mixed=False):
+        self._kwargs = locals().copy()
+        del self._kwargs['self']
+        self._initialize(**self._kwargs)
+
+    def _initialize(self, out, err, in_, mixed):
         self._out = out
         self._err = err 
         self._in = in_
         if out: 
-            self.oldout = sys.stdout
-            sys.stdout = self.newout = StringIO()
+            self._oldout = sys.stdout
+            if not hasattr(out, 'write'):
+                out = StringIO()
+            sys.stdout = self.out = out
         if err: 
-            self.olderr = sys.stderr
+            self._olderr = sys.stderr
             if out and mixed: 
-                newerr = self.newout 
-            else:
-                newerr = StringIO()
-            sys.stderr = self.newerr = newerr
+                err = self.out 
+            elif not hasattr(err, 'write'):
+                err = StringIO()
+            sys.stderr = self.err = err
         if in_:
-            self.oldin  = sys.stdin
+            self._oldin  = sys.stdin
             sys.stdin  = self.newin  = DontReadFromInput()
 
     def done(self): 
@@ -102,28 +159,39 @@ class StdCapture(Capture):
         o,e = sys.stdout, sys.stderr
         if self._out: 
             try:
-                sys.stdout = self.oldout 
+                sys.stdout = self._oldout 
             except AttributeError:
                 raise IOError("stdout capturing already reset")
-            del self.oldout
-            outfile = self.newout
+            del self._oldout
+            outfile = self.out
             outfile.seek(0)
         else:
-            outfile = StringIO()
+            outfile = None
         if self._err: 
             try:
-                sys.stderr = self.olderr 
+                sys.stderr = self._olderr 
             except AttributeError:
                 raise IOError("stderr capturing already reset")
-            del self.olderr 
-            errfile = self.newerr 
+            del self._olderr 
+            errfile = self.err 
             errfile.seek(0)
         else:
-            errfile = StringIO()
+            errfile = None
         if self._in:
-            sys.stdin = self.oldin 
+            sys.stdin = self._oldin 
         return outfile, errfile
 
+    def readouterr(self):
+        """ return snapshot value of stdout/stderr capturings. """
+        out = err = ""
+        if self._out:
+            out = sys.stdout.getvalue()
+            sys.stdout.truncate(0)
+        if self._err:
+            err = sys.stderr.getvalue()
+            sys.stderr.truncate(0)
+        return out, err 
+
 class DontReadFromInput:
     """Temporary stub class.  Ideally when stdin is accessed, the
     capturing should be turned off, with possibly all data captured
diff --git a/py/io/testing/test_stdcapture.py b/py/io/testing/test_stdcapture.py
index 5e857c5b2..59627eb21 100644
--- a/py/io/testing/test_stdcapture.py
+++ b/py/io/testing/test_stdcapture.py
@@ -30,6 +30,19 @@ class TestStdCapture:
         assert out == "hello world\n"
         assert err == "hello error\n"
 
+    def test_capturing_readouterr(self):
+        cap = self.getcapture()
+        try:
+            print "hello world"
+            print >>sys.stderr, "hello error"
+            out, err = cap.readouterr()
+            assert out == "hello world\n"
+            assert err == "hello error\n"
+            print >>sys.stderr, "error2"
+        finally:
+            out, err = cap.reset()
+        assert err == "error2\n"
+
     def test_capturing_mixed(self):
         cap = self.getcapture(mixed=True)
         print "hello",
@@ -43,7 +56,7 @@ class TestStdCapture:
         cap = self.getcapture() 
         print "hello"
         cap.reset()
-        py.test.raises(EnvironmentError, "cap.reset()")
+        py.test.raises(Exception, "cap.reset()")
 
     def test_capturing_modify_sysouterr_in_between(self):
         oldout = sys.stdout 
@@ -67,7 +80,7 @@ class TestStdCapture:
         cap2 = self.getcapture() 
         print "cap2"
         out2, err2 = cap2.reset()
-        py.test.raises(EnvironmentError, "cap2.reset()")
+        py.test.raises(Exception, "cap2.reset()")
         out1, err1 = cap1.reset() 
         assert out1 == "cap1\n"
         assert out2 == "cap2\n"
@@ -104,6 +117,24 @@ class TestStdCapture:
         py.test.raises(IOError, "sys.stdin.read()")
         out, err = cap.reset()
 
+    def test_suspend_resume(self):
+        cap = self.getcapture(out=True, err=False, in_=False)
+        try:
+            print "hello"
+            sys.stderr.write("error\n")
+            out, err = cap.suspend()
+            assert out == "hello\n"
+            assert not err 
+            print "in between"
+            sys.stderr.write("in between\n")
+            cap.resume()
+            print "after"
+            sys.stderr.write("error_after\n")
+        finally:
+            out, err = cap.reset()
+        assert out == "after\n"
+        assert not err 
+
 class TestStdCaptureFD(TestStdCapture): 
     def getcapture(self, **kw): 
         return py.io.StdCaptureFD(**kw)
@@ -150,10 +181,14 @@ def test_callcapture_nofd():
         os.write(1, "hello")
         os.write(2, "hello")
         print x
-        print >>py.std.sys.stderr, y
+        print >>sys.stderr, y
         return 42
    
-    res, out, err = py.io.StdCapture.call(func, 3, y=4) 
+    capfd = py.io.StdCaptureFD(patchsys=False)
+    try:
+        res, out, err = py.io.StdCapture.call(func, 3, y=4) 
+    finally:
+        capfd.reset()
     assert res == 42 
     assert out.startswith("3") 
     assert err.startswith("4") 
diff --git a/py/test/defaultconftest.py b/py/test/defaultconftest.py
index 0bdcb6868..a57d5fcfc 100644
--- a/py/test/defaultconftest.py
+++ b/py/test/defaultconftest.py
@@ -12,3 +12,4 @@ Instance = py.test.collect.Instance
 
 pytest_plugins = "default runner iocapture terminal keyword xfail tmpdir execnetcleanup monkeypatch recwarn pdb unittest".split()
 
+conf_capture = "fd"
diff --git a/py/test/plugin/pytest_default.py b/py/test/plugin/pytest_default.py
index 83c53306d..eda634d0e 100644
--- a/py/test/plugin/pytest_default.py
+++ b/py/test/plugin/pytest_default.py
@@ -81,9 +81,6 @@ def pytest_addoption(parser):
                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_iocapture.py b/py/test/plugin/pytest_iocapture.py
index 5302d7743..5bf6657b1 100644
--- a/py/test/plugin/pytest_iocapture.py
+++ b/py/test/plugin/pytest_iocapture.py
@@ -1,60 +1,97 @@
 """
-convenient capturing of writes to stdout/stderror streams and file descriptors. 
+configurable per-test stdout/stderr capturing mechanisms. 
 
-Example Usage
-----------------------
+This plugin captures stdout/stderr output for each test separately. 
+In case of test failures this captured output is shown grouped 
+togtther with the test. 
 
-You can use the `capsys funcarg`_ to capture writes 
-to stdout and stderr streams by using it in a test 
-likes this:
+The plugin also provides test function arguments that help to
+assert stdout/stderr output from within your tests, see the 
+`funcarg example`_. 
+
+
+Capturing of input/output streams during tests 
+---------------------------------------------------
+
+By default ``sys.stdout`` and ``sys.stderr`` are substituted with
+temporary streams during the execution of tests and setup/teardown code.  
+During the whole testing process it will re-use the same temporary 
+streams allowing to play well with the logging module which easily
+takes ownership on these streams. 
+
+Also, 'sys.stdin' is substituted with a file-like "null" object that 
+does not return any values.  This is to immediately error out
+on tests that wait on reading something from stdin. 
+
+You can influence output capturing mechanisms from the command line::
+
+    py.test -s            # disable all capturing
+    py.test --capture=sys # set StringIO() to each of sys.stdout/stderr 
+    py.test --capture=fd  # capture stdout/stderr on Filedescriptors 1/2 
+
+If you set capturing values in a conftest file like this::
+
+    # conftest.py
+    conf_capture = 'fd'
+
+then all tests in that directory will execute with "fd" style capturing. 
+
+sys-level capturing 
+------------------------------------------
+
+Capturing on 'sys' level means that ``sys.stdout`` and ``sys.stderr`` 
+will be replaced with StringIO() objects.   
+
+FD-level capturing and subprocesses
+------------------------------------------
+
+The ``fd`` based method means that writes going to system level files
+based on the standard file descriptors will be captured, for example 
+writes such as ``os.write(1, 'hello')`` will be captured properly. 
+Capturing on fd-level will include output generated from 
+any subprocesses created during a test. 
+
+.. _`funcarg example`:
+
+Example Usage of the capturing Function arguments
+---------------------------------------------------
+
+You can use the `capsys funcarg`_ and `capfd funcarg`_ to 
+capture writes to stdout and stderr streams.  Using the
+funcargs frees your test from having to care about setting/resetting 
+the old streams and also interacts well with py.test's own 
+per-test capturing.  Here is an example test function:
 
 .. sourcecode:: python
 
     def test_myoutput(capsys):
         print "hello" 
         print >>sys.stderr, "world"
-        out, err = capsys.reset()
+        out, err = capsys.readouterr()
         assert out == "hello\\n"
         assert err == "world\\n"
         print "next"
-        out, err = capsys.reset()
+        out, err = capsys.readouterr()
         assert out == "next\\n" 
 
-The ``reset()`` call returns a tuple and will restart 
-capturing so that you can successively check for output. 
-After the test function finishes the original streams
-will be restored. 
+The ``readouterr()`` call snapshots the output so far - 
+and capturing will be continued.  After the test 
+function finishes the original streams will 
+be restored.  If you want to capture on 
+the filedescriptor level you can use the ``capfd`` function
+argument which offers the same interface. 
 """
 
 import py
 
 def pytest_addoption(parser):
     group = parser.getgroup("general")
-    group._addoption('-s', 
-       action="store_true", dest="nocapture", default=False,
-       help="disable catching of stdout/stderr during test run.")
+    group._addoption('-s', action="store_const", const="no", dest="capture", 
+        help="shortcut for --capture=no.")
+    group._addoption('--capture', action="store", default=None,
+        metavar="capture", type="choice", choices=['fd', 'sys', 'no'],
+        help="set IO capturing method during tests: sys|fd|no.")
 
-def determine_capturing(config, path=None):
-    iocapture = config.getvalue("iocapture", path=path)
-    if iocapture == "fd": 
-        return py.io.StdCaptureFD()
-    elif iocapture == "sys":
-        return py.io.StdCapture()
-    elif iocapture == "no": 
-        return py.io.StdCapture(out=False, err=False, in_=False)
-    else:
-        # how to raise errors here? 
-        raise config.Error("unknown io capturing: " + iocapture)
-
-def pytest_make_collect_report(__call__, collector):
-    cap = determine_capturing(collector.config, collector.fspath)
-    try:
-        rep = __call__.execute(firstresult=True)
-    finally:
-        outerr = cap.reset()
-    addouterr(rep, outerr)
-    return rep
-   
 def addouterr(rep, outerr):
     repr = getattr(rep, 'longrepr', None)
     if not hasattr(repr, 'addsection'):
@@ -64,79 +101,140 @@ def addouterr(rep, outerr):
             repr.addsection("Captured std%s" % secname, content.rstrip())
 
 def pytest_configure(config):
-    if not config.option.nocapture:
-        config.pluginmanager.register(CapturePerTest())
+    config.pluginmanager.register(CaptureManager(), 'capturemanager')
 
-
-class CapturePerTest:
+class CaptureManager:
     def __init__(self):
-        self.item2capture = {}
-        
-    def _setcapture(self, item):
-        assert item not in self.item2capture
-        cap = determine_capturing(item.config, path=item.fspath)
-        self.item2capture[item] = cap
+        self._method2capture = {}
+
+    def _startcapture(self, method):
+        if method == "fd": 
+            return py.io.StdCaptureFD()
+        elif method == "sys":
+            return py.io.StdCapture()
+        else:
+            raise ValueError("unknown capturing method: %r" % method)
+
+    def _getmethod(self, config, fspath):
+        if config.option.capture:
+            return config.option.capture
+        return config._conftest.rget("conf_capture", path=fspath)
+
+    def resumecapture_item(self, item):
+        method = self._getmethod(item.config, item.fspath)
+        if not hasattr(item, 'outerr'):
+            item.outerr = ('', '') # we accumulate outerr on the item
+        return self.resumecapture(method)
+
+    def resumecapture(self, method):
+        if hasattr(self, '_capturing'):
+            raise ValueError("cannot resume, already capturing with %r" % 
+                (self._capturing,))
+        if method != "no":
+            cap = self._method2capture.get(method)
+            if cap is None:
+                cap = self._startcapture(method)
+                self._method2capture[method] = cap 
+            else:
+                cap.resume()
+        self._capturing = method 
+
+    def suspendcapture(self):
+        self.deactivate_funcargs()
+        method = self._capturing
+        if method != "no":
+            cap = self._method2capture[method]
+            outerr = cap.suspend()
+        else:
+            outerr = "", ""
+        del self._capturing
+        return outerr 
+
+    def activate_funcargs(self, pyfuncitem):
+        if not hasattr(pyfuncitem, 'funcargs'):
+            return
+        assert not hasattr(self, '_capturing_funcargs')
+        l = []
+        for name, obj in pyfuncitem.funcargs.items():
+            if name in ('capsys', 'capfd'):
+                obj._start()
+                l.append(obj)
+        if l:
+            self._capturing_funcargs = l
+
+    def deactivate_funcargs(self):
+        if hasattr(self, '_capturing_funcargs'):
+            for capfuncarg in self._capturing_funcargs:
+                capfuncarg._finalize()
+            del self._capturing_funcargs
+
+    def pytest_make_collect_report(self, __call__, collector):
+        method = self._getmethod(collector.config, collector.fspath)
+        self.resumecapture(method)
+        try:
+            rep = __call__.execute(firstresult=True)
+        finally:
+            outerr = self.suspendcapture()
+        addouterr(rep, outerr)
+        return rep
 
     def pytest_runtest_setup(self, item):
-        self._setcapture(item)
+        self.resumecapture_item(item)
 
     def pytest_runtest_call(self, item):
-        self._setcapture(item)
+        self.resumecapture_item(item)
+        self.activate_funcargs(item)
 
     def pytest_runtest_teardown(self, item):
-        self._setcapture(item)
+        self.resumecapture_item(item)
 
     def pytest_keyboard_interrupt(self, excinfo):
-        for cap in self.item2capture.values():
-            cap.reset()
-        self.item2capture.clear()
+        if hasattr(self, '_capturing'):
+            self.suspendcapture()
 
     def pytest_runtest_makereport(self, __call__, item, call):
-        capture = self.item2capture.pop(item)
-        outerr = capture.reset()
-        # XXX shift reporting elsewhere 
+        self.deactivate_funcargs()
         rep = __call__.execute(firstresult=True)
-        addouterr(rep, outerr)
-
+        outerr = self.suspendcapture()
+        outerr = (item.outerr[0] + outerr[0], item.outerr[1] + outerr[1])
+        if not rep.passed:
+            addouterr(rep, outerr)
+        if not rep.passed or rep.when == "teardown":
+            outerr = ('', '')
+        item.outerr = outerr 
         return rep
 
 def pytest_funcarg__capsys(request):
     """captures writes to sys.stdout/sys.stderr and makes 
-    them available successively via a ``capsys.reset()`` method 
-    which returns a ``(out, err)`` tuple of captured strings. 
+    them available successively via a ``capsys.readouterr()`` method 
+    which returns a ``(out, err)`` tuple of captured snapshot strings. 
     """ 
-    capture = CaptureFuncarg(py.io.StdCapture)
-    request.addfinalizer(capture.finalize)
-    return capture 
+    return CaptureFuncarg(request, py.io.StdCapture)
 
 def pytest_funcarg__capfd(request):
     """captures writes to file descriptors 1 and 2 and makes 
-    them available successively via a ``capsys.reset()`` method 
-    which returns a ``(out, err)`` tuple of captured strings. 
+    snapshotted ``(out, err)`` string tuples available 
+    via the ``capsys.readouterr()`` method. 
     """ 
-    capture = CaptureFuncarg(py.io.StdCaptureFD)
-    request.addfinalizer(capture.finalize)
-    return capture 
+    return CaptureFuncarg(request, py.io.StdCaptureFD)
 
-def pytest_pyfunc_call(pyfuncitem):
-    if hasattr(pyfuncitem, 'funcargs'):
-        for funcarg, value in pyfuncitem.funcargs.items():
-            if funcarg == "capsys" or funcarg == "capfd":
-                value.reset()
 
 class CaptureFuncarg:
-    _capture = None
-    def __init__(self, captureclass):
-        self._captureclass = captureclass
+    def __init__(self, request, captureclass):
+        self._cclass = captureclass
+        #request.addfinalizer(self._finalize)
 
-    def finalize(self):
-        if self._capture:
-            self._capture.reset()
+    def _start(self):
+        self.capture = self._cclass()
 
-    def reset(self):
-        res = None
-        if self._capture:
-            res = self._capture.reset()
-        self._capture = self._captureclass()
-        return res 
+    def _finalize(self):
+        if hasattr(self, 'capture'):
+            self.capture.reset()
+            del self.capture 
 
+    def readouterr(self):
+        return self.capture.readouterr()
+
+    def close(self):
+        self.capture.reset()
+        del self.capture
diff --git a/py/test/plugin/pytest_pdb.py b/py/test/plugin/pytest_pdb.py
index a7266ecbd..e049d8dbd 100644
--- a/py/test/plugin/pytest_pdb.py
+++ b/py/test/plugin/pytest_pdb.py
@@ -23,11 +23,18 @@ def pytest_configure(config):
 class PdbInvoke:
     def pytest_runtest_makereport(self, item, call):
         if call.excinfo and not call.excinfo.errisinstance(Skipped): 
+            # XXX hack hack hack to play well with capturing
+            capman = item.config.pluginmanager.impname2plugin['capturemanager']
+            capman.suspendcapture() 
+
             tw = py.io.TerminalWriter()
             repr = call.excinfo.getrepr()
             repr.toterminal(tw) 
             post_mortem(call.excinfo._excinfo[2])
 
+            # XXX hack end 
+            capman.resumecapture_item(item)
+
 class Pdb(py.std.pdb.Pdb):
     def do_list(self, arg):
         self.lastcmd = 'list'
diff --git a/py/test/plugin/pytest_pytester.py b/py/test/plugin/pytest_pytester.py
index f022df147..8d162f1f5 100644
--- a/py/test/plugin/pytest_pytester.py
+++ b/py/test/plugin/pytest_pytester.py
@@ -301,6 +301,9 @@ class TmpTestdir:
         assert script.check()
         return py.std.sys.executable, script
 
+    def runpython(self, script):
+        return self.run(py.std.sys.executable, script)
+
     def runpytest(self, *args):
         p = py.path.local.make_numbered_dir(prefix="runpytest-", 
             keep=None, rootdir=self.tmpdir)
@@ -520,7 +523,6 @@ def test_testdir_runs_with_plugin(testdir):
 def pytest_funcarg__venv(request):
     p = request.config.mktemp(request.function.__name__, numbered=True)
     venv = VirtualEnv(str(p)) 
-    venv.create()
     return venv 
    
 def pytest_funcarg__py_setup(request):
@@ -533,6 +535,7 @@ def pytest_funcarg__py_setup(request):
 class SetupBuilder:
     def __init__(self, setup_path):
         self.setup_path = setup_path
+        assert setup_path.check()
 
     def make_sdist(self, destdir=None):
         temp = py.path.local.mkdtemp()
@@ -567,9 +570,9 @@ class VirtualEnv(object):
     def _cmd(self, name):
         return os.path.join(self.path, 'bin', name)
 
-    @property
-    def valid(self):
-        return os.path.exists(self._cmd('python'))
+    def ensure(self):
+        if not os.path.exists(self._cmd('python')):
+            self.create()
 
     def create(self, sitepackages=False):
         args = ['virtualenv', self.path]
@@ -582,7 +585,7 @@ class VirtualEnv(object):
         return py.execnet.makegateway("popen//python=%s" %(python,))
 
     def pcall(self, cmd, *args, **kw):
-        assert self.valid
+        self.ensure()
         return subprocess.call([
                 self._cmd(cmd)
             ] + list(args),
diff --git a/py/test/plugin/pytest_terminal.py b/py/test/plugin/pytest_terminal.py
index 40e1bef0c..97f2da8e2 100644
--- a/py/test/plugin/pytest_terminal.py
+++ b/py/test/plugin/pytest_terminal.py
@@ -314,7 +314,8 @@ class TerminalReporter:
                 self.write_sep("_", msg)
                 if hasattr(rep, 'node'):
                     self.write_line(self.gateway2info.get(
-                        rep.node.gateway, "node %r (platinfo not found? strange)")
+                        rep.node.gateway, 
+                        "node %r (platinfo not found? strange)")
                             [:self._tw.fullwidth-1])
                 rep.toterminal(self._tw)
 
diff --git a/py/test/plugin/test_pytest_iocapture.py b/py/test/plugin/test_pytest_iocapture.py
new file mode 100644
index 000000000..2890f071e
--- /dev/null
+++ b/py/test/plugin/test_pytest_iocapture.py
@@ -0,0 +1,363 @@
+import py, os, sys
+from py.__.test.plugin.pytest_iocapture import CaptureManager
+
+class TestCaptureManager:
+
+    def test_configure_per_fspath(self, testdir):
+        config = testdir.parseconfig(testdir.tmpdir)
+        assert config.getvalue("capture") is None
+        capman = CaptureManager()
+        assert capman._getmethod(config, None) == "fd" # default
+
+        for name in ('no', 'fd', 'sys'):
+            sub = testdir.tmpdir.mkdir("dir" + name)
+            sub.ensure("__init__.py")
+            sub.join("conftest.py").write('conf_capture = %r' % name)
+            assert capman._getmethod(config, sub.join("test_hello.py")) == name
+
+    @py.test.mark.multi(method=['no', 'fd', 'sys'])
+    def test_capturing_basic_api(self, method):
+        capouter = py.io.StdCaptureFD()
+        old = sys.stdout, sys.stderr, sys.stdin
+        try:
+            capman = CaptureManager()
+            capman.resumecapture(method)
+            print "hello"
+            out, err = capman.suspendcapture()
+            if method == "no":
+                assert old == (sys.stdout, sys.stderr, sys.stdin)
+            else:
+                assert out == "hello\n"
+            capman.resumecapture(method)
+            out, err = capman.suspendcapture()
+            assert not out and not err 
+        finally:
+            capouter.reset()
+      
+    def test_juggle_capturings(self, testdir):
+        capouter = py.io.StdCaptureFD()
+        try:
+            config = testdir.parseconfig(testdir.tmpdir)
+            capman = CaptureManager()
+            capman.resumecapture("fd")
+            py.test.raises(ValueError, 'capman.resumecapture("fd")')
+            py.test.raises(ValueError, 'capman.resumecapture("sys")')
+            os.write(1, "hello\n")
+            out, err = capman.suspendcapture()
+            assert out == "hello\n"
+            capman.resumecapture("sys")
+            os.write(1, "hello\n")
+            print >>sys.stderr, "world"
+            out, err = capman.suspendcapture()
+            assert not out
+            assert err == "world\n"
+        finally:
+            capouter.reset()
+
+def test_collect_capturing(testdir):
+    p = testdir.makepyfile("""
+        print "collect %s failure" % 13
+        import xyz42123
+    """)
+    result = testdir.runpytest(p)
+    result.stdout.fnmatch_lines([
+        "*Captured stdout*",
+        "*collect 13 failure*", 
+    ])
+
+class TestPerTestCapturing:
+    def test_capture_and_fixtures(self, testdir):
+        p = testdir.makepyfile("""
+            def setup_module(mod):
+                print "setup module"
+            def setup_function(function):
+                print "setup", function.__name__
+            def test_func1():
+                print "in func1"
+                assert 0
+            def test_func2():
+                print "in func2"
+                assert 0
+        """)
+        result = testdir.runpytest(p)
+        result.stdout.fnmatch_lines([
+            "setup module*",
+            "setup test_func1*",
+            "in func1*",
+            "setup test_func2*",
+            "in func2*", 
+        ]) 
+
+    def test_no_carry_over(self, testdir):
+        p = testdir.makepyfile("""
+            def test_func1():
+                print "in func1"
+            def test_func2():
+                print "in func2"
+                assert 0
+        """)
+        result = testdir.runpytest(p)
+        s = result.stdout.str()
+        assert "in func1" not in s 
+        assert "in func2" in s 
+
+
+    def test_teardown_capturing(self, testdir):
+        p = testdir.makepyfile("""
+            def setup_function(function):
+                print "setup func1"
+            def teardown_function(function):
+                print "teardown func1"
+                assert 0
+            def test_func1(): 
+                print "in func1"
+                pass
+        """)
+        result = testdir.runpytest(p)
+        assert result.stdout.fnmatch_lines([
+            '*teardown_function*',
+            '*Captured stdout*',
+            "setup func1*",
+            "in func1*",
+            "teardown func1*",
+            #"*1 fixture failure*"
+        ])
+
+    @py.test.mark.xfail
+    def test_teardown_final_capturing(self, testdir):
+        p = testdir.makepyfile("""
+            def teardown_module(mod):
+                print "teardown module"
+                assert 0
+            def test_func():
+                pass
+        """)
+        result = testdir.runpytest(p)
+        assert result.stdout.fnmatch_lines([
+            "teardown module*", 
+            #"*1 fixture failure*"
+        ])
+
+    def test_capturing_outerr(self, testdir): 
+        p1 = testdir.makepyfile("""
+            import sys 
+            def test_capturing():
+                print 42
+                print >>sys.stderr, 23 
+            def test_capturing_error():
+                print 1
+                print >>sys.stderr, 2
+                raise ValueError
+        """)
+        result = testdir.runpytest(p1)
+        result.stdout.fnmatch_lines([
+            "*test_capturing_outerr.py .F", 
+            "====* FAILURES *====",
+            "____*____", 
+            "*test_capturing_outerr.py:8: ValueError",
+            "*--- Captured stdout ---*",
+            "1",
+            "*--- Captured stderr ---*",
+            "2",
+        ])
+
+class TestLoggingInteraction:
+    def test_logging_stream_ownership(self, testdir):
+        p = testdir.makepyfile("""
+            def test_logging():
+                import logging
+                import StringIO
+                stream = StringIO.StringIO()
+                logging.basicConfig(stream=stream)
+                stream.close() # to free memory/release resources
+        """)
+        result = testdir.runpytest(p)
+        result.stderr.str().find("atexit") == -1
+
+    def test_capturing_and_logging_fundamentals(self, testdir):
+        # here we check a fundamental feature 
+        rootdir = str(py.path.local(py.__file__).dirpath().dirpath())
+        p = testdir.makepyfile("""
+            import sys
+            sys.path.insert(0, %r)
+            import py, logging
+            cap = py.io.StdCaptureFD(out=False, in_=False)
+            logging.warn("hello1")
+            outerr = cap.suspend()
+
+            print "suspeneded and captured", outerr
+
+            logging.warn("hello2")
+
+            cap.resume()
+            logging.warn("hello3")
+
+            outerr = cap.suspend()
+            print "suspend2 and captured", outerr
+        """ % rootdir)
+        result = testdir.runpython(p)
+        assert result.stdout.fnmatch_lines([
+            "suspeneded and captured*hello1*",
+            "suspend2 and captured*hello2*WARNING:root:hello3*",
+        ])
+        assert "atexit" not in result.stderr.str()
+        
+           
+    def test_logging_and_immediate_setupteardown(self, testdir):
+        p = testdir.makepyfile("""
+            import logging
+            def setup_function(function):
+                logging.warn("hello1")
+
+            def test_logging():
+                logging.warn("hello2")
+                assert 0
+
+            def teardown_function(function):
+                logging.warn("hello3")
+                assert 0
+        """)
+        for optargs in (('--capture=sys',), ('--capture=fd',)):
+            print optargs
+            result = testdir.runpytest(p, *optargs)
+            s = result.stdout.str()
+            result.stdout.fnmatch_lines([
+                "*WARN*hello1", 
+                "*WARN*hello2", 
+                "*WARN*hello3", 
+            ])
+            # verify proper termination
+            assert "closed" not in s
+
+    @py.test.mark.xfail
+    def test_logging_and_crossscope_fixtures(self, testdir):
+        # XXX also needs final teardown reporting to work!
+        p = testdir.makepyfile("""
+            import logging
+            def setup_module(function):
+                logging.warn("hello1")
+
+            def test_logging():
+                logging.warn("hello2")
+                assert 0
+
+            def teardown_module(function):
+                logging.warn("hello3")
+                assert 0
+        """)
+        for optargs in (('--iocapture=sys',), ('--iocapture=fd',)):
+            print optargs
+            result = testdir.runpytest(p, *optargs)
+            s = result.stdout.str()
+            result.stdout.fnmatch_lines([
+                "*WARN*hello1", 
+                "*WARN*hello2", 
+                "*WARN*hello3", 
+            ])
+            # verify proper termination
+            assert "closed" not in s
+
+class TestCaptureFuncarg:
+    def test_std_functional(self, testdir):        
+        reprec = testdir.inline_runsource("""
+            def test_hello(capsys):
+                print 42
+                out, err = capsys.readouterr()
+                assert out.startswith("42")
+        """)
+        reprec.assertoutcome(passed=1)
+        
+    def test_stdfd_functional(self, testdir):        
+        reprec = testdir.inline_runsource("""
+            def test_hello(capfd):
+                import os
+                os.write(1, "42")
+                out, err = capfd.readouterr()
+                assert out.startswith("42")
+                capfd.close()
+        """)
+        reprec.assertoutcome(passed=1)
+
+    def test_partial_setup_failure(self, testdir):        
+        p = testdir.makepyfile("""
+            def test_hello(capfd, missingarg):
+                pass
+        """)
+        result = testdir.runpytest(p)
+        assert result.stdout.fnmatch_lines([
+            "*test_partial_setup_failure*",
+            "*1 failed*",
+        ])
+
+    def test_keyboardinterrupt_disables_capturing(self, testdir):        
+        p = testdir.makepyfile("""
+            def test_hello(capfd):
+                import os
+                os.write(1, "42")
+                raise KeyboardInterrupt()
+        """)
+        result = testdir.runpytest(p)
+        result.stdout.fnmatch_lines([
+            "*KEYBOARD INTERRUPT*"
+        ])
+        assert result.ret == 2
+
+
+
+class TestFixtureReporting:
+    @py.test.mark.xfail
+    def test_setup_fixture_error(self, testdir):
+        p = testdir.makepyfile("""
+            def setup_function(function):
+                print "setup func"
+                assert 0
+            def test_nada():
+                pass
+        """)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines([
+            "*FIXTURE ERROR at setup of test_nada*",
+            "*setup_function(function):*",
+            "*setup func*",
+            "*assert 0*",
+            "*0 passed*1 error*",
+        ])
+        assert result.ret != 0
+    
+    @py.test.mark.xfail
+    def test_teardown_fixture_error(self, testdir):
+        p = testdir.makepyfile("""
+            def test_nada():
+                pass
+            def teardown_function(function):
+                print "teardown func"
+                assert 0
+        """)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines([
+            "*FIXTURE ERROR at teardown*", 
+            "*teardown_function(function):*",
+            "*teardown func*",
+            "*assert 0*",
+            "*1 passed*1 error*",
+        ])
+
+    @py.test.mark.xfail
+    def test_teardown_fixture_error_and_test_failure(self, testdir):
+        p = testdir.makepyfile("""
+            def test_fail():
+                assert 0, "failingfunc"
+
+            def teardown_function(function):
+                print "teardown func"
+                assert 0
+        """)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines([
+            "*failingfunc*", 
+            "*FIXTURE ERROR at teardown*", 
+            "*teardown_function(function):*",
+            "*teardown func*",
+            "*assert 0*",
+            "*1 failed*1 error",
+         ])
diff --git a/py/test/testing/test_install.py b/py/test/testing/test_install.py
index a6865bf70..211422231 100644
--- a/py/test/testing/test_install.py
+++ b/py/test/testing/test_install.py
@@ -1,9 +1,16 @@
 import py
 
-def test_make_sdist_and_run_it(py_setup, venv):
-    sdist = py_setup.make_sdist(venv.path)
-    venv.easy_install(str(sdist)) 
-    gw = venv.makegateway()
-    ch = gw.remote_exec("import py ; channel.send(py.__version__)")
-    version = ch.receive()
-    assert version == py.__version__
+def test_make_sdist_and_run_it(capfd, py_setup, venv):
+    try:
+        sdist = py_setup.make_sdist(venv.path)
+        venv.easy_install(str(sdist)) 
+        gw = venv.makegateway()
+        ch = gw.remote_exec("import py ; channel.send(py.__version__)")
+        version = ch.receive()
+        assert version == py.__version__
+    except KeyboardInterrupt:
+        raise
+    except:
+        print capfd.readouterr()
+        raise
+    capfd.close()
diff --git a/py/test/testing/test_parseopt.py b/py/test/testing/test_parseopt.py
index c608f9df5..bd1dc2023 100644
--- a/py/test/testing/test_parseopt.py
+++ b/py/test/testing/test_parseopt.py
@@ -1,13 +1,11 @@
 import py
 from py.__.test import parseopt 
 
-pytest_plugins = 'pytest_iocapture'
-
 class TestParser:
     def test_init(self, capsys):
         parser = parseopt.Parser(usage="xyz")
         py.test.raises(SystemExit, 'parser.parse(["-h"])')
-        out, err = capsys.reset()
+        out, err = capsys.readouterr()
         assert out.find("xyz") != -1
 
     def test_group_add_and_get(self):

From 61c53602f2bd58be8e8da08cc327626302cbae53 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 31 Jul 2009 14:22:02 +0200
Subject: [PATCH 10/15] introduce new "Error" outcome and group setup/teardown
 and collection failures into that category. Report them separately.

--HG--
branch : 1.0.x
---
 CHANGELOG                               |  4 ++
 py/test/plugin/pytest_runner.py         |  9 ++++
 py/test/plugin/pytest_terminal.py       | 42 +++++++++++++----
 py/test/plugin/test_pytest_iocapture.py | 61 +-----------------------
 py/test/plugin/test_pytest_terminal.py  | 62 ++++++++++++++++++++++++-
 py/test/testing/test_funcargs.py        |  2 +-
 6 files changed, 110 insertions(+), 70 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9368d7a95..fe8910b5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,10 @@ Changes between 1.0.0b8 and 1.0.0b9
 * fix svn-1.6 compat issue with py.path.svnwc().versioned()
   (thanks Wouter Vanden Hove)
 
+* setup/teardown or collection problems now show as ERRORs
+  or with big "E"'s in the progress lines.  they are reported
+  and counted separately. 
+ 
 * dist-testing: properly handle test items that get locally 
   collected but cannot be collected on the remote side - often 
   due to platform/dependency reasons
diff --git a/py/test/plugin/pytest_runner.py b/py/test/plugin/pytest_runner.py
index 96d34c420..6b8ed913a 100644
--- a/py/test/plugin/pytest_runner.py
+++ b/py/test/plugin/pytest_runner.py
@@ -70,6 +70,15 @@ def pytest_runtest_makereport(item, call):
 def pytest_runtest_teardown(item):
     item.config._setupstate.teardown_exact(item)
 
+def pytest_report_teststatus(rep):
+    if rep.when in ("setup", "teardown"):
+        if rep.failed:
+            #      category, shortletter, verbose-word 
+            return "error", "E", "ERROR"
+        elif rep.skipped:
+            return "skipped", "s", "SKIPPED"
+        else:
+            return "", "", ""
 #
 # Implementation
 
diff --git a/py/test/plugin/pytest_terminal.py b/py/test/plugin/pytest_terminal.py
index 97f2da8e2..9dcfcff3d 100644
--- a/py/test/plugin/pytest_terminal.py
+++ b/py/test/plugin/pytest_terminal.py
@@ -167,10 +167,11 @@ class TerminalReporter:
                 self.write_fspath_result(fspath, "")
 
     def pytest_runtest_logreport(self, rep):
-        if rep.passed and rep.when in ("setup", "teardown"):
-            return 
         fspath = rep.item.fspath 
         cat, letter, word = self.getcategoryletterword(rep)
+        if not letter and not word:
+            # probably passed setup/teardown
+            return
         if isinstance(word, tuple):
             word, markup = word
         else:
@@ -194,9 +195,9 @@ class TerminalReporter:
     def pytest_collectreport(self, rep):
         if not rep.passed:
             if rep.failed:
-                self.stats.setdefault("failed", []).append(rep)
+                self.stats.setdefault("error", []).append(rep)
                 msg = rep.longrepr.reprcrash.message 
-                self.write_fspath_result(rep.collector.fspath, "F")
+                self.write_fspath_result(rep.collector.fspath, "E")
             elif rep.skipped:
                 self.stats.setdefault("skipped", []).append(rep)
                 self.write_fspath_result(rep.collector.fspath, "S")
@@ -237,6 +238,7 @@ class TerminalReporter:
         __call__.execute() 
         self._tw.line("")
         if exitstatus in (0, 1, 2):
+            self.summary_errors()
             self.summary_failures()
             self.summary_skips()
             self.config.hook.pytest_terminal_summary(terminalreporter=self)
@@ -312,17 +314,39 @@ class TerminalReporter:
             for rep in self.stats['failed']:
                 msg = self._getfailureheadline(rep)
                 self.write_sep("_", msg)
-                if hasattr(rep, 'node'):
-                    self.write_line(self.gateway2info.get(
-                        rep.node.gateway, 
-                        "node %r (platinfo not found? strange)")
-                            [:self._tw.fullwidth-1])
+                self.write_platinfo(rep)
                 rep.toterminal(self._tw)
 
+    def summary_errors(self):
+        if 'error' in self.stats and self.config.option.tbstyle != "no":
+            self.write_sep("=", "ERRORS")
+            for rep in self.stats['error']:
+                msg = self._getfailureheadline(rep)
+                if not hasattr(rep, 'when'):
+                    # collect
+                    msg = "ERROR during collection " + msg
+                elif rep.when == "setup":
+                    msg = "ERROR at setup of " + msg 
+                elif rep.when == "teardown":
+                    msg = "ERROR at teardown of " + msg 
+                self.write_sep("_", msg)
+                self.write_platinfo(rep)
+                rep.toterminal(self._tw)
+
+    def write_platinfo(self, rep):
+        if hasattr(rep, 'node'):
+            self.write_line(self.gateway2info.get(
+                rep.node.gateway, 
+                "node %r (platinfo not found? strange)")
+                    [:self._tw.fullwidth-1])
+
     def summary_stats(self):
         session_duration = py.std.time.time() - self._sessionstarttime
 
         keys = "failed passed skipped deselected".split()
+        for key in self.stats.keys():
+            if key not in keys:
+                keys.append(key)
         parts = []
         for key in keys:
             val = self.stats.get(key, None)
diff --git a/py/test/plugin/test_pytest_iocapture.py b/py/test/plugin/test_pytest_iocapture.py
index 2890f071e..1a7b3ff0b 100644
--- a/py/test/plugin/test_pytest_iocapture.py
+++ b/py/test/plugin/test_pytest_iocapture.py
@@ -222,9 +222,9 @@ class TestLoggingInteraction:
             result = testdir.runpytest(p, *optargs)
             s = result.stdout.str()
             result.stdout.fnmatch_lines([
+                "*WARN*hello3",  # errors show first!
                 "*WARN*hello1", 
                 "*WARN*hello2", 
-                "*WARN*hello3", 
             ])
             # verify proper termination
             assert "closed" not in s
@@ -286,7 +286,7 @@ class TestCaptureFuncarg:
         result = testdir.runpytest(p)
         assert result.stdout.fnmatch_lines([
             "*test_partial_setup_failure*",
-            "*1 failed*",
+            "*1 error*",
         ])
 
     def test_keyboardinterrupt_disables_capturing(self, testdir):        
@@ -304,60 +304,3 @@ class TestCaptureFuncarg:
 
 
 
-class TestFixtureReporting:
-    @py.test.mark.xfail
-    def test_setup_fixture_error(self, testdir):
-        p = testdir.makepyfile("""
-            def setup_function(function):
-                print "setup func"
-                assert 0
-            def test_nada():
-                pass
-        """)
-        result = testdir.runpytest()
-        result.stdout.fnmatch_lines([
-            "*FIXTURE ERROR at setup of test_nada*",
-            "*setup_function(function):*",
-            "*setup func*",
-            "*assert 0*",
-            "*0 passed*1 error*",
-        ])
-        assert result.ret != 0
-    
-    @py.test.mark.xfail
-    def test_teardown_fixture_error(self, testdir):
-        p = testdir.makepyfile("""
-            def test_nada():
-                pass
-            def teardown_function(function):
-                print "teardown func"
-                assert 0
-        """)
-        result = testdir.runpytest()
-        result.stdout.fnmatch_lines([
-            "*FIXTURE ERROR at teardown*", 
-            "*teardown_function(function):*",
-            "*teardown func*",
-            "*assert 0*",
-            "*1 passed*1 error*",
-        ])
-
-    @py.test.mark.xfail
-    def test_teardown_fixture_error_and_test_failure(self, testdir):
-        p = testdir.makepyfile("""
-            def test_fail():
-                assert 0, "failingfunc"
-
-            def teardown_function(function):
-                print "teardown func"
-                assert 0
-        """)
-        result = testdir.runpytest()
-        result.stdout.fnmatch_lines([
-            "*failingfunc*", 
-            "*FIXTURE ERROR at teardown*", 
-            "*teardown_function(function):*",
-            "*teardown func*",
-            "*assert 0*",
-            "*1 failed*1 error",
-         ])
diff --git a/py/test/plugin/test_pytest_terminal.py b/py/test/plugin/test_pytest_terminal.py
index fbe9272bd..47d1c7231 100644
--- a/py/test/plugin/test_pytest_terminal.py
+++ b/py/test/plugin/test_pytest_terminal.py
@@ -89,9 +89,10 @@ class TestTerminal:
         p = testdir.makepyfile("import xyz")
         result = testdir.runpytest(*option._getcmdargs())
         result.stdout.fnmatch_lines([
-            "*test_collect_fail.py F*",
+            "*test_collect_fail.py E*",
             ">   import xyz",
             "E   ImportError: No module named xyz",
+            "*1 error*",
         ])
 
     def test_internalerror(self, testdir, linecomp):
@@ -357,3 +358,62 @@ def test_repr_python_version(monkeypatch):
     py.std.sys.version_info = x = (2,3)
     assert repr_pythonversion() == str(x) 
 
+class TestFixtureReporting:
+    def test_setup_fixture_error(self, testdir):
+        p = testdir.makepyfile("""
+            def setup_function(function):
+                print "setup func"
+                assert 0
+            def test_nada():
+                pass
+        """)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines([
+            "*ERROR at setup of test_nada*",
+            "*setup_function(function):*",
+            "*setup func*",
+            "*assert 0*",
+            "*1 error*",
+        ])
+        assert result.ret != 0
+    
+    def test_teardown_fixture_error(self, testdir):
+        p = testdir.makepyfile("""
+            def test_nada():
+                pass
+            def teardown_function(function):
+                print "teardown func"
+                assert 0
+        """)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines([
+            "*ERROR at teardown*", 
+            "*teardown_function(function):*",
+            "*assert 0*",
+            "*Captured stdout*",
+            "*teardown func*",
+            "*1 passed*1 error*",
+        ])
+
+    def test_teardown_fixture_error_and_test_failure(self, testdir):
+        p = testdir.makepyfile("""
+            def test_fail():
+                assert 0, "failingfunc"
+
+            def teardown_function(function):
+                print "teardown func"
+                assert False
+        """)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines([
+            "*ERROR at teardown of test_fail*", 
+            "*teardown_function(function):*",
+            "*assert False*",
+            "*Captured stdout*",
+            "*teardown func*",
+
+            "*test_fail*", 
+            "*def test_fail():",
+            "*failingfunc*",
+            "*1 failed*1 error*",
+         ])
diff --git a/py/test/testing/test_funcargs.py b/py/test/testing/test_funcargs.py
index bb5e5556b..2b132058d 100644
--- a/py/test/testing/test_funcargs.py
+++ b/py/test/testing/test_funcargs.py
@@ -194,7 +194,7 @@ class TestRequest:
         """)
         result = testdir.runpytest(p)
         assert result.stdout.fnmatch_lines([
-            "*1 failed*1 passed*"
+            "*1 passed*1 error*"
             ])
 
     def test_request_getmodulepath(self, testdir):

From 737c32c78384b6382ff4fb9a1eb1d17fd5b2acdd Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 31 Jul 2009 14:22:02 +0200
Subject: [PATCH 11/15] handle final teardown properly, add a new experimental
 hook for it.

--HG--
branch : 1.0.x
---
 CHANGELOG                               |  2 ++
 py/test/dist/txnode.py                  | 16 +++---------
 py/test/plugin/hookspec.py              |  8 ++++++
 py/test/plugin/pytest_iocapture.py      | 14 ++++++++++
 py/test/plugin/pytest_runner.py         | 34 +++++++++++++++++++------
 py/test/plugin/pytest_terminal.py       |  8 ++++--
 py/test/plugin/test_pytest_iocapture.py |  7 ++---
 7 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fe8910b5d..f8bfbf540 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Changes between 1.0.0b8 and 1.0.0b9
 =====================================
 
+* cleanly handle and report final teardown of test setup
+
 * fix svn-1.6 compat issue with py.path.svnwc().versioned()
   (thanks Wouter Vanden Hove)
 
diff --git a/py/test/dist/txnode.py b/py/test/dist/txnode.py
index 513772947..0d98aed90 100644
--- a/py/test/dist/txnode.py
+++ b/py/test/dist/txnode.py
@@ -115,6 +115,7 @@ class SlaveNode(object):
             self.config.basetemp = py.path.local(basetemp)
         self.config.pluginmanager.do_configure(self.config)
         self.config.pluginmanager.register(self)
+        self.runner = self.config.pluginmanager.getplugin("pytest_runner")
         self.sendevent("slaveready")
         try:
             while 1:
@@ -135,26 +136,15 @@ class SlaveNode(object):
             raise
 
     def run_single(self, item):
-        call = CallInfo(item._checkcollectable, 'setup')
+        call = self.runner.CallInfo(item._checkcollectable, when='setup')
         if call.excinfo:
             # likely it is not collectable here because of
             # platform/import-dependency induced skips 
             # XXX somewhat ugly shortcuts - also makes a collection
             #     failure into an ItemTestReport - this might confuse
             #     pytest_runtest_logreport hooks 
-            runner = item.config.pluginmanager.getplugin("pytest_runner")
-            rep = runner.pytest_runtest_makereport(item=item, call=call)
+            rep = self.runner.pytest_runtest_makereport(item=item, call=call)
             self.pytest_runtest_logreport(rep)
             return
         item.config.hook.pytest_runtest_protocol(item=item) 
 
-class CallInfo:
-    excinfo = None 
-    def __init__(self, func, when):
-        self.when = when 
-        try:
-            self.result = func()
-        except KeyboardInterrupt:
-            raise
-        except:
-            self.excinfo = py.code.ExceptionInfo()
diff --git a/py/test/plugin/hookspec.py b/py/test/plugin/hookspec.py
index ac3260c41..15e506ba9 100644
--- a/py/test/plugin/hookspec.py
+++ b/py/test/plugin/hookspec.py
@@ -86,6 +86,14 @@ pytest_runtest_makereport.firstresult = True
 def pytest_runtest_logreport(rep):
     """ process item test report. """ 
 
+# special handling for final teardown - somewhat internal for now
+def pytest__teardown_final(session):
+    """ called before test session finishes. """
+pytest__teardown_final.firstresult = True
+
+def pytest__teardown_final_logerror(rep):
+    """ called if runtest_teardown_final failed. """ 
+
 # -------------------------------------------------------------------------
 # test session related hooks 
 # -------------------------------------------------------------------------
diff --git a/py/test/plugin/pytest_iocapture.py b/py/test/plugin/pytest_iocapture.py
index 5bf6657b1..33a53f586 100644
--- a/py/test/plugin/pytest_iocapture.py
+++ b/py/test/plugin/pytest_iocapture.py
@@ -188,6 +188,20 @@ class CaptureManager:
     def pytest_runtest_teardown(self, item):
         self.resumecapture_item(item)
 
+    def pytest_runtest_teardown(self, item):
+        self.resumecapture_item(item)
+
+    def pytest__teardown_final(self, __call__, session):
+        method = self._getmethod(session.config, None)
+        self.resumecapture(method)
+        try:
+            rep = __call__.execute(firstresult=True)
+        finally:
+            outerr = self.suspendcapture()
+        if rep:
+            addouterr(rep, outerr)
+        return rep
+
     def pytest_keyboard_interrupt(self, excinfo):
         if hasattr(self, '_capturing'):
             self.suspendcapture()
diff --git a/py/test/plugin/pytest_runner.py b/py/test/plugin/pytest_runner.py
index 6b8ed913a..bae86aa1b 100644
--- a/py/test/plugin/pytest_runner.py
+++ b/py/test/plugin/pytest_runner.py
@@ -22,7 +22,10 @@ def pytest_configure(config):
 def pytest_sessionfinish(session, exitstatus):
     # XXX see above
     if hasattr(session.config, '_setupstate'):
-        session.config._setupstate.teardown_all()
+        hook = session.config.hook
+        rep = hook.pytest__teardown_final(session=session)
+        if rep:
+            hook.pytest__teardown_final_logerror(rep=rep)
     # prevent logging module atexit handler from choking on 
     # its attempt to close already closed streams 
     # see http://bugs.python.org/issue6333
@@ -70,6 +73,12 @@ def pytest_runtest_makereport(item, call):
 def pytest_runtest_teardown(item):
     item.config._setupstate.teardown_exact(item)
 
+def pytest__teardown_final(session):
+    call = CallInfo(session.config._setupstate.teardown_all, when="teardown")
+    if call.excinfo:
+        rep = TeardownErrorReport(call.excinfo)
+        return rep 
+
 def pytest_report_teststatus(rep):
     if rep.when in ("setup", "teardown"):
         if rep.failed:
@@ -83,22 +92,24 @@ def pytest_report_teststatus(rep):
 # Implementation
 
 def call_and_report(item, when, log=True):
-    call = RuntestHookCall(item, when)
+    call = call_runtest_hook(item, when)
     hook = item.config.hook
     report = hook.pytest_runtest_makereport(item=item, call=call)
     if log and (when == "call" or not report.passed):
         hook.pytest_runtest_logreport(rep=report) 
     return report
 
-class RuntestHookCall:
+def call_runtest_hook(item, when):
+    hookname = "pytest_runtest_" + when 
+    hook = getattr(item.config.hook, hookname)
+    return CallInfo(lambda: hook(item=item), when=when)
+
+class CallInfo:
     excinfo = None 
-    _prefix = "pytest_runtest_"
-    def __init__(self, item, when):
+    def __init__(self, func, when):
         self.when = when 
-        hookname = self._prefix + when 
-        hook = getattr(item.config.hook, hookname)
         try:
-            self.result = hook(item=item)
+            self.result = func()
         except KeyboardInterrupt:
             raise
         except:
@@ -209,6 +220,13 @@ class CollectReport(BaseReport):
     def getnode(self):
         return self.collector 
 
+class TeardownErrorReport(BaseReport):
+    skipped = passed = False 
+    failed = True
+    when = "teardown"
+    def __init__(self, excinfo):
+        self.longrepr = excinfo.getrepr(funcargs=True)
+
 class SetupState(object):
     """ shared state for setting up/tearing down test items or collectors. """
     def __init__(self):
diff --git a/py/test/plugin/pytest_terminal.py b/py/test/plugin/pytest_terminal.py
index 9dcfcff3d..9347aa63c 100644
--- a/py/test/plugin/pytest_terminal.py
+++ b/py/test/plugin/pytest_terminal.py
@@ -166,8 +166,10 @@ class TerminalReporter:
                 fspath, lineno, msg = self._getreportinfo(item)
                 self.write_fspath_result(fspath, "")
 
+    def pytest__teardown_final_logerror(self, rep):
+        self.stats.setdefault("error", []).append(rep)
+ 
     def pytest_runtest_logreport(self, rep):
-        fspath = rep.item.fspath 
         cat, letter, word = self.getcategoryletterword(rep)
         if not letter and not word:
             # probably passed setup/teardown
@@ -290,9 +292,11 @@ class TerminalReporter:
     def _getfailureheadline(self, rep):
         if hasattr(rep, "collector"):
             return str(rep.collector.fspath)
-        else:
+        elif hasattr(rep, 'item'):
             fspath, lineno, msg = self._getreportinfo(rep.item)
             return msg
+        else:
+            return "test session" 
 
     def _getreportinfo(self, item):
         try:
diff --git a/py/test/plugin/test_pytest_iocapture.py b/py/test/plugin/test_pytest_iocapture.py
index 1a7b3ff0b..5156f707c 100644
--- a/py/test/plugin/test_pytest_iocapture.py
+++ b/py/test/plugin/test_pytest_iocapture.py
@@ -123,7 +123,6 @@ class TestPerTestCapturing:
             #"*1 fixture failure*"
         ])
 
-    @py.test.mark.xfail
     def test_teardown_final_capturing(self, testdir):
         p = testdir.makepyfile("""
             def teardown_module(mod):
@@ -134,8 +133,10 @@ class TestPerTestCapturing:
         """)
         result = testdir.runpytest(p)
         assert result.stdout.fnmatch_lines([
-            "teardown module*", 
-            #"*1 fixture failure*"
+            "*def teardown_module(mod):*", 
+            "*Captured stdout*", 
+            "*teardown module*", 
+            "*1 error*", 
         ])
 
     def test_capturing_outerr(self, testdir): 

From a7382df5e9a6dcea98f58a5bca1f56f3702b7828 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 31 Jul 2009 14:22:02 +0200
Subject: [PATCH 12/15] fix/work around some corner cases for dist-testing

--HG--
branch : 1.0.x
---
 py/process/testing/test_forkedfunc.py |  4 +-
 py/test/dist/dsession.py              | 35 +++++++++++++---
 py/test/dist/mypickle.py              |  3 +-
 py/test/dist/testing/test_dsession.py | 57 ++++++++++++++++++++++++++-
 py/test/dist/testing/test_txnode.py   |  3 ++
 py/test/dist/txnode.py                |  5 +++
 py/test/plugin/pytest_runner.py       | 11 ++++++
 7 files changed, 108 insertions(+), 10 deletions(-)

diff --git a/py/process/testing/test_forkedfunc.py b/py/process/testing/test_forkedfunc.py
index b3dccb44e..a93753170 100644
--- a/py/process/testing/test_forkedfunc.py
+++ b/py/process/testing/test_forkedfunc.py
@@ -11,12 +11,12 @@ def test_waitfinish_removes_tempdir():
     ff.waitfinish()
     assert not ff.tempdir.check()
 
-def test_tempdir_gets_gc_collected():
+def test_tempdir_gets_gc_collected(monkeypatch):
+    monkeypatch.setattr(os, 'fork', lambda: os.getpid())
     ff = py.process.ForkedFunc(boxf1)
     assert ff.tempdir.check()
     ff.__del__()
     assert not ff.tempdir.check()
-    os.waitpid(ff.pid, 0)
 
 def test_basic_forkedfunc():
     result = py.process.ForkedFunc(boxf1).waitfinish()
diff --git a/py/test/dist/dsession.py b/py/test/dist/dsession.py
index 4b3ae3fc5..604b4a50d 100644
--- a/py/test/dist/dsession.py
+++ b/py/test/dist/dsession.py
@@ -11,6 +11,13 @@ from py.__.test.dist.nodemanage import NodeManager
 
 import Queue 
 
+debug_file = None # open('/tmp/loop.log', 'w')
+def debug(*args):
+    if debug_file is not None:
+        s = " ".join(map(str, args))
+        debug_file.write(s+"\n")
+        debug_file.flush()
+
 class LoopState(object):
     def __init__(self, dsession, colitems):
         self.dsession = dsession
@@ -23,9 +30,14 @@ class LoopState(object):
         self.shuttingdown = False
         self.testsfailed = False
 
+    def __repr__(self):
+        return "<LoopState exitstatus=%r shuttingdown=%r len(colitems)=%d>" % (
+            self.exitstatus, self.shuttingdown, len(self.colitems))
+
     def pytest_runtest_logreport(self, rep):
         if rep.item in self.dsession.item2nodes:
-            self.dsession.removeitem(rep.item, rep.node)
+            if rep.when != "teardown": # otherwise we have already managed it
+                self.dsession.removeitem(rep.item, rep.node)
         if rep.failed:
             self.testsfailed = True
 
@@ -39,9 +51,14 @@ class LoopState(object):
     def pytest_testnodedown(self, node, error=None):
         pending = self.dsession.removenode(node)
         if pending:
-            crashitem = pending[0]
-            self.dsession.handle_crashitem(crashitem, node)
-            self.colitems.extend(pending[1:])
+            if error:
+                crashitem = pending[0]
+                debug("determined crashitem", crashitem)
+                self.dsession.handle_crashitem(crashitem, node)
+                # XXX recovery handling for "each"? 
+                # currently pending items are not retried 
+                if self.dsession.config.option.dist == "load":
+                    self.colitems.extend(pending[1:])
 
     def pytest_rescheduleitems(self, items):
         self.colitems.extend(items)
@@ -115,6 +132,9 @@ class DSession(Session):
         if eventname == "pytest_testnodedown":
             self.config.hook.pytest_testnodedown(**kwargs)
             self.removenode(kwargs['node'])
+        elif eventname == "pytest_runtest_logreport":
+            # might be some teardown report
+            self.config.hook.pytest_runtest_logreport(**kwargs)
         if not self.node2pending:
             # finished
             if loopstate.testsfailed:
@@ -200,7 +220,9 @@ class DSession(Session):
             node.sendlist(sending)
             pending.extend(sending)
             for item in sending:
-                self.item2nodes.setdefault(item, []).append(node)
+                nodes = self.item2nodes.setdefault(item, [])
+                assert node not in nodes
+                nodes.append(node)
                 self.config.hook.pytest_itemstart(item=item, node=node)
         tosend[:] = tosend[room:]  # update inplace
         if tosend:
@@ -237,7 +259,8 @@ class DSession(Session):
             nodes.remove(node)
         if not nodes:
             del self.item2nodes[item]
-        self.node2pending[node].remove(item)
+        pending = self.node2pending[node]
+        pending.remove(item)
 
     def handle_crashitem(self, item, node):
         runner = item.config.pluginmanager.getplugin("runner") 
diff --git a/py/test/dist/mypickle.py b/py/test/dist/mypickle.py
index fa0a5538a..75b60444e 100644
--- a/py/test/dist/mypickle.py
+++ b/py/test/dist/mypickle.py
@@ -69,7 +69,8 @@ class ImmutablePickler:
         pickler = MyPickler(f, self._protocol, uneven=self.uneven)
         pickler.memo = self._picklememo
         pickler.dump(obj)
-        self._updateunpicklememo()
+        if obj is not None:
+            self._updateunpicklememo()
         #print >>debug, "dumped", obj 
         #print >>debug, "picklememo", self._picklememo
         return f.getvalue()
diff --git a/py/test/dist/testing/test_dsession.py b/py/test/dist/testing/test_dsession.py
index 5c2b1afd2..6b2b150c5 100644
--- a/py/test/dist/testing/test_dsession.py
+++ b/py/test/dist/testing/test_dsession.py
@@ -155,6 +155,45 @@ class TestDSession:
         dumpqueue(session.queue)
         assert loopstate.exitstatus == outcome.EXIT_NOHOSTS
 
+    def test_removeitem_from_failing_teardown(self, testdir):
+        # teardown reports only come in when they signal a failure
+        # internal session-management should basically ignore them 
+        # XXX probably it'S best to invent a new error hook for 
+        # teardown/setup related failures
+        modcol = testdir.getmodulecol("""
+            def test_one(): 
+                pass 
+            def teardown_function(function):
+                assert 0
+        """)
+        item1, = modcol.collect()
+
+        # setup a session with two nodes
+        session = DSession(item1.config)
+        node1, node2 = MockNode(), MockNode()
+        session.addnode(node1)
+        session.addnode(node2)
+      
+        # have one test pending for a node that goes down 
+        session.senditems_each([item1])
+        nodes = session.item2nodes[item1]
+        class rep:
+            failed = True
+            item = item1
+            node = nodes[0]
+            when = "call"
+        session.queueevent("pytest_runtest_logreport", rep=rep)
+        reprec = testdir.getreportrecorder(session)
+        print session.item2nodes
+        loopstate = session._initloopstate([])
+        assert len(session.item2nodes[item1]) == 2
+        session.loop_once(loopstate)
+        assert len(session.item2nodes[item1]) == 1
+        rep.when = "teardown"
+        session.queueevent("pytest_runtest_logreport", rep=rep)
+        session.loop_once(loopstate)
+        assert len(session.item2nodes[item1]) == 1
+
     def test_testnodedown_causes_reschedule_pending(self, testdir):
         modcol = testdir.getmodulecol("""
             def test_crash(): 
@@ -173,7 +212,8 @@ class TestDSession:
         # have one test pending for a node that goes down 
         session.senditems_load([item1, item2])
         node = session.item2nodes[item1] [0]
-        session.queueevent("pytest_testnodedown", node=node, error=None)
+        item1.config.option.dist = "load"
+        session.queueevent("pytest_testnodedown", node=node, error="xyz")
         reprec = testdir.getreportrecorder(session)
         print session.item2nodes
         loopstate = session._initloopstate([])
@@ -385,3 +425,18 @@ def test_collected_function_causes_remote_skip(testdir):
     result.stdout.fnmatch_lines([
         "*2 skipped*"
     ])
+
+def test_teardownfails_one_function(testdir):
+    p = testdir.makepyfile("""
+        def test_func(): 
+            pass
+        def teardown_function(function):
+            assert 0
+    """)
+    result = testdir.runpytest(p, '--dist=each', '--tx=popen')
+    result.stdout.fnmatch_lines([
+        "*def teardown_function(function):*", 
+        "*1 passed*1 error*"
+    ])
+
+
diff --git a/py/test/dist/testing/test_txnode.py b/py/test/dist/testing/test_txnode.py
index 4e47537c3..b5a20b951 100644
--- a/py/test/dist/testing/test_txnode.py
+++ b/py/test/dist/testing/test_txnode.py
@@ -32,6 +32,7 @@ class EventQueue:
 
 class MySetup:
     def __init__(self, request):
+        self.id = 0
         self.request = request
 
     def geteventargs(self, eventname, timeout=2.0):
@@ -45,6 +46,8 @@ class MySetup:
         self.queue = py.std.Queue.Queue()
         self.xspec = py.execnet.XSpec("popen")
         self.gateway = py.execnet.makegateway(self.xspec)
+        self.id += 1
+        self.gateway.id = str(self.id)
         self.node = TXNode(self.gateway, self.config, putevent=self.queue.put)
         assert not self.node.channel.isclosed()
         return self.node 
diff --git a/py/test/dist/txnode.py b/py/test/dist/txnode.py
index 0d98aed90..2ef063620 100644
--- a/py/test/dist/txnode.py
+++ b/py/test/dist/txnode.py
@@ -21,6 +21,11 @@ class TXNode(object):
         self.channel.setcallback(self.callback, endmarker=self.ENDMARK)
         self._down = False
 
+    def __repr__(self):
+        id = self.gateway.id
+        status = self._down and 'true' or 'false'
+        return "<TXNode %r down=%s>" %(id, status)
+
     def notify(self, eventname, *args, **kwargs):
         assert not args
         self.putevent((eventname, args, kwargs))
diff --git a/py/test/plugin/pytest_runner.py b/py/test/plugin/pytest_runner.py
index bae86aa1b..d3fa89381 100644
--- a/py/test/plugin/pytest_runner.py
+++ b/py/test/plugin/pytest_runner.py
@@ -198,6 +198,17 @@ class ItemTestReport(BaseReport):
             self.shortrepr = shortrepr 
             self.longrepr = longrepr 
 
+    def __repr__(self):
+        status = (self.passed and "passed" or 
+                  self.skipped and "skipped" or 
+                  self.failed and "failed" or 
+                  "CORRUPT")
+        l = [repr(self.item.name), "when=%r" % self.when, "outcome %r" % status,]
+        if hasattr(self, 'node'):
+            l.append("txnode=%s" % self.node.gateway.id)
+        info = " " .join(map(str, l))
+        return "<ItemTestReport %s>" % info 
+
     def getnode(self):
         return self.item 
 

From 5156216871408e7c58543df50e9c9b1222a01651 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 31 Jul 2009 14:43:04 +0200
Subject: [PATCH 13/15] regen manifest, improve docs generation

--HG--
branch : 1.0.x
---
 MANIFEST                        |  3 +++
 doc/test/plugin/doctest.txt     |  6 +-----
 doc/test/plugin/figleaf.txt     |  6 +-----
 doc/test/plugin/hooklog.txt     |  6 +-----
 doc/test/plugin/hookspec.txt    |  9 +++++++++
 doc/test/plugin/index.txt       | 16 +---------------
 doc/test/plugin/iocapture.txt   |  6 +-----
 doc/test/plugin/keyword.txt     |  6 +-----
 doc/test/plugin/links.txt       | 33 +++++++++++++++++++++++++++++++++
 doc/test/plugin/monkeypatch.txt |  6 +-----
 doc/test/plugin/pdb.txt         |  6 +-----
 doc/test/plugin/pocoo.txt       |  6 +-----
 doc/test/plugin/recwarn.txt     |  6 +-----
 doc/test/plugin/restdoc.txt     |  6 +-----
 doc/test/plugin/resultlog.txt   |  6 +-----
 doc/test/plugin/terminal.txt    |  6 +-----
 doc/test/plugin/unittest.txt    |  6 +-----
 doc/test/plugin/xfail.txt       |  6 +-----
 makepluginlist.py               | 22 ++++++++++++++++++++--
 19 files changed, 80 insertions(+), 87 deletions(-)
 create mode 100644 doc/test/plugin/links.txt

diff --git a/MANIFEST b/MANIFEST
index 1a2c689ec..90fa7a29f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -30,11 +30,14 @@ doc/test/features.txt
 doc/test/funcargs.txt
 doc/test/plugin/doctest.txt
 doc/test/plugin/figleaf.txt
+doc/test/plugin/hooklog.txt
 doc/test/plugin/hookspec.txt
 doc/test/plugin/index.txt
 doc/test/plugin/iocapture.txt
+doc/test/plugin/keyword.txt
 doc/test/plugin/monkeypatch.txt
 doc/test/plugin/oejskit.txt
+doc/test/plugin/pdb.txt
 doc/test/plugin/pocoo.txt
 doc/test/plugin/recwarn.txt
 doc/test/plugin/restdoc.txt
diff --git a/doc/test/plugin/doctest.txt b/doc/test/plugin/doctest.txt
index fd4fb8f90..95d525b48 100644
--- a/doc/test/plugin/doctest.txt
+++ b/doc/test/plugin/doctest.txt
@@ -37,8 +37,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_doctest.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/figleaf.txt b/doc/test/plugin/figleaf.txt
index e48be57ce..737b116ce 100644
--- a/doc/test/plugin/figleaf.txt
+++ b/doc/test/plugin/figleaf.txt
@@ -32,8 +32,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_figleaf.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/hooklog.txt b/doc/test/plugin/hooklog.txt
index 270b5bb02..4fb4d8f40 100644
--- a/doc/test/plugin/hooklog.txt
+++ b/doc/test/plugin/hooklog.txt
@@ -28,8 +28,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_hooklog.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/hookspec.txt b/doc/test/plugin/hookspec.txt
index 3a2cfecd7..bb78cdf11 100644
--- a/doc/test/plugin/hookspec.txt
+++ b/doc/test/plugin/hookspec.txt
@@ -92,6 +92,14 @@ hook specification sourcecode
     def pytest_runtest_logreport(rep):
         """ process item test report. """ 
     
+    # special handling for final teardown - somewhat internal for now
+    def pytest__teardown_final(session):
+        """ called before test session finishes. """
+    pytest__teardown_final.firstresult = True
+    
+    def pytest__teardown_final_logerror(rep):
+        """ called if runtest_teardown_final failed. """ 
+    
     # -------------------------------------------------------------------------
     # test session related hooks 
     # -------------------------------------------------------------------------
@@ -163,3 +171,4 @@ hook specification sourcecode
     def pytest_trace(category, msg):
         """ called for debug info. """ 
 
+.. include:: links.txt
diff --git a/doc/test/plugin/index.txt b/doc/test/plugin/index.txt
index 4c8ea9615..f7e6cee6d 100644
--- a/doc/test/plugin/index.txt
+++ b/doc/test/plugin/index.txt
@@ -45,18 +45,4 @@ keyword_ mark test functions with keywords that may hold values.
 hooklog_ log invocations of extension hooks to a file.
 
 
-.. _`xfail`: xfail.html
-.. _`figleaf`: figleaf.html
-.. _`monkeypatch`: monkeypatch.html
-.. _`iocapture`: iocapture.html
-.. _`recwarn`: recwarn.html
-.. _`unittest`: unittest.html
-.. _`doctest`: doctest.html
-.. _`oejskit`: oejskit.html
-.. _`restdoc`: restdoc.html
-.. _`pocoo`: pocoo.html
-.. _`resultlog`: resultlog.html
-.. _`terminal`: terminal.html
-.. _`pdb`: pdb.html
-.. _`keyword`: keyword.html
-.. _`hooklog`: hooklog.html
+.. include:: links.txt
diff --git a/doc/test/plugin/iocapture.txt b/doc/test/plugin/iocapture.txt
index 7aefb0420..c3a01d658 100644
--- a/doc/test/plugin/iocapture.txt
+++ b/doc/test/plugin/iocapture.txt
@@ -128,8 +128,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_iocapture.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_iocapture.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/keyword.txt b/doc/test/plugin/keyword.txt
index e6e640f9d..91756ac5b 100644
--- a/doc/test/plugin/keyword.txt
+++ b/doc/test/plugin/keyword.txt
@@ -43,8 +43,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_keyword.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/links.txt b/doc/test/plugin/links.txt
new file mode 100644
index 000000000..157b91272
--- /dev/null
+++ b/doc/test/plugin/links.txt
@@ -0,0 +1,33 @@
+.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_recwarn.py
+.. _`pytest_iocapture.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_iocapture.py
+.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_monkeypatch.py
+.. _`plugins`: index.html
+.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_doctest.py
+.. _`terminal`: terminal.html
+.. _`hooklog`: hooklog.html
+.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_restdoc.py
+.. _`xfail`: xfail.html
+.. _`pytest_pocoo.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_pocoo.py
+.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_keyword.py
+.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_figleaf.py
+.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_hooklog.py
+.. _`contact`: ../../contact.html
+.. _`pocoo`: pocoo.html
+.. _`checkout the py.test development version`: ../../download.html#checkout
+.. _`oejskit`: oejskit.html
+.. _`unittest`: unittest.html
+.. _`iocapture`: iocapture.html
+.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_xfail.py
+.. _`figleaf`: figleaf.html
+.. _`extend`: ../extend.html
+.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_terminal.py
+.. _`recwarn`: recwarn.html
+.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_pdb.py
+.. _`monkeypatch`: monkeypatch.html
+.. _`resultlog`: resultlog.html
+.. _`keyword`: keyword.html
+.. _`restdoc`: restdoc.html
+.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_unittest.py
+.. _`doctest`: doctest.html
+.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_resultlog.py
+.. _`pdb`: pdb.html
diff --git a/doc/test/plugin/monkeypatch.txt b/doc/test/plugin/monkeypatch.txt
index 0d3e37528..b1f40a37c 100644
--- a/doc/test/plugin/monkeypatch.txt
+++ b/doc/test/plugin/monkeypatch.txt
@@ -58,8 +58,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_monkeypatch.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/pdb.txt b/doc/test/plugin/pdb.txt
index 26eefdca4..bea0f5084 100644
--- a/doc/test/plugin/pdb.txt
+++ b/doc/test/plugin/pdb.txt
@@ -28,8 +28,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_pdb.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/pocoo.txt b/doc/test/plugin/pocoo.txt
index 187cb72de..c4c3b5d9a 100644
--- a/doc/test/plugin/pocoo.txt
+++ b/doc/test/plugin/pocoo.txt
@@ -28,8 +28,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_pocoo.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_pocoo.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/recwarn.txt b/doc/test/plugin/recwarn.txt
index 40da066ce..98915f9d0 100644
--- a/doc/test/plugin/recwarn.txt
+++ b/doc/test/plugin/recwarn.txt
@@ -58,8 +58,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_recwarn.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/restdoc.txt b/doc/test/plugin/restdoc.txt
index 423c000ff..1e9d21bb8 100644
--- a/doc/test/plugin/restdoc.txt
+++ b/doc/test/plugin/restdoc.txt
@@ -32,8 +32,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_restdoc.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/resultlog.txt b/doc/test/plugin/resultlog.txt
index 0b0276088..8cdfd32ee 100644
--- a/doc/test/plugin/resultlog.txt
+++ b/doc/test/plugin/resultlog.txt
@@ -28,8 +28,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_resultlog.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/terminal.txt b/doc/test/plugin/terminal.txt
index a298cb8b0..ab6cde48c 100644
--- a/doc/test/plugin/terminal.txt
+++ b/doc/test/plugin/terminal.txt
@@ -21,8 +21,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_terminal.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/unittest.txt b/doc/test/plugin/unittest.txt
index 857279d2d..68d245fca 100644
--- a/doc/test/plugin/unittest.txt
+++ b/doc/test/plugin/unittest.txt
@@ -31,8 +31,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_unittest.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/doc/test/plugin/xfail.txt b/doc/test/plugin/xfail.txt
index 48bd01abc..4764a224d 100644
--- a/doc/test/plugin/xfail.txt
+++ b/doc/test/plugin/xfail.txt
@@ -33,8 +33,4 @@ Do you find the above documentation or the plugin itself lacking?
 
 Further information: extend_ documentation, other plugins_ or contact_.  
 
-.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/6e9879aca934933c6065776820f22095634a7edf/py/test/plugin/pytest_xfail.py
-.. _`extend`: ../extend.html
-.. _`plugins`: index.html
-.. _`contact`: ../../contact.html
-.. _`checkout the py.test development version`: ../../download.html#checkout
+.. include:: links.txt
diff --git a/makepluginlist.py b/makepluginlist.py
index d88c9584b..70bd69faa 100644
--- a/makepluginlist.py
+++ b/makepluginlist.py
@@ -28,6 +28,8 @@ def warn(*args):
     print >>sys.stderr, "WARN:", msg
 
 class RestWriter:
+    _all_links = {}
+
     def __init__(self, target):
         self.target = py.path.local(target)
         self.links = []
@@ -92,9 +94,23 @@ class RestWriter:
 
     def write_links(self):
         self.Print()
+        self.Print(".. include:: links.txt")
         for link in self.links:
-            #warn(repr(self.link))
-            self.Print(".. _`%s`: %s" % (link[0], link[1]))
+            key = link[0]
+            if key in self._all_links:
+                assert self._all_links[key] == link[1], (key, link[1])
+            else:
+                self._all_links[key] = link[1]
+      
+    def write_all_links(cls, linkpath):
+        p = linkpath.new(basename="links.txt")
+        p_writer = RestWriter(p)
+        p_writer.out = p_writer.target.open("w")
+        for name, value in cls._all_links.items():
+            p_writer.Print(".. _`%s`: %s" % (name, value))
+        p_writer.out.close()
+        del p_writer.out
+    write_all_links = classmethod(write_all_links)
 
     def make(self, **kwargs):
         self.out = self.target.open("w")
@@ -266,3 +282,5 @@ if __name__ == "__main__":
     ov = HookSpec(testdir.join("plugin", "hookspec.txt"))
     ov.make(config=_config)
 
+    RestWriter.write_all_links(testdir.join("plugin", "links.txt"))
+

From e80714d7017e74c41c0a6195518a3d0c760e5cd4 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 31 Jul 2009 15:35:22 +0200
Subject: [PATCH 14/15] fixes for python 2.4

--HG--
branch : 1.0.x
---
 doc/test/plugin/links.txt         | 28 ++++++++++++++--------------
 py/test/plugin/pytest_pytester.py |  9 +++++++--
 py/test/plugin/pytest_restdoc.py  |  7 ++++---
 py/test/plugin/pytest_runner.py   |  7 -------
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/doc/test/plugin/links.txt b/doc/test/plugin/links.txt
index 157b91272..8735f6ebc 100644
--- a/doc/test/plugin/links.txt
+++ b/doc/test/plugin/links.txt
@@ -1,33 +1,33 @@
-.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_recwarn.py
-.. _`pytest_iocapture.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_iocapture.py
-.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_monkeypatch.py
+.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_recwarn.py
+.. _`pytest_iocapture.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_iocapture.py
+.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_monkeypatch.py
 .. _`plugins`: index.html
-.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_doctest.py
+.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_doctest.py
 .. _`terminal`: terminal.html
 .. _`hooklog`: hooklog.html
-.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_restdoc.py
+.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_restdoc.py
 .. _`xfail`: xfail.html
-.. _`pytest_pocoo.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_pocoo.py
-.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_keyword.py
-.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_figleaf.py
-.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_hooklog.py
+.. _`pytest_pocoo.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_pocoo.py
+.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_keyword.py
+.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_figleaf.py
+.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_hooklog.py
 .. _`contact`: ../../contact.html
 .. _`pocoo`: pocoo.html
 .. _`checkout the py.test development version`: ../../download.html#checkout
 .. _`oejskit`: oejskit.html
 .. _`unittest`: unittest.html
 .. _`iocapture`: iocapture.html
-.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_xfail.py
+.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_xfail.py
 .. _`figleaf`: figleaf.html
 .. _`extend`: ../extend.html
-.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_terminal.py
+.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_terminal.py
 .. _`recwarn`: recwarn.html
-.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_pdb.py
+.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_pdb.py
 .. _`monkeypatch`: monkeypatch.html
 .. _`resultlog`: resultlog.html
 .. _`keyword`: keyword.html
 .. _`restdoc`: restdoc.html
-.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_unittest.py
+.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_unittest.py
 .. _`doctest`: doctest.html
-.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_resultlog.py
+.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_resultlog.py
 .. _`pdb`: pdb.html
diff --git a/py/test/plugin/pytest_pytester.py b/py/test/plugin/pytest_pytester.py
index 8d162f1f5..d97c70100 100644
--- a/py/test/plugin/pytest_pytester.py
+++ b/py/test/plugin/pytest_pytester.py
@@ -542,7 +542,7 @@ class SetupBuilder:
         try:
             args = ['python', str(self.setup_path), 'sdist', 
                     '--dist-dir', str(temp)]
-            subprocess.check_call(args)
+            subcall(args)
             l = temp.listdir('py-*')
             assert len(l) == 1
             sdist = l[0]
@@ -557,6 +557,11 @@ class SetupBuilder:
         finally:
             temp.remove()
 
+def subcall(args):
+    if hasattr(subprocess, 'check_call'):
+        subprocess.check_call(args)
+    else:
+        subprocess.call(args)
 # code taken from Ronny Pfannenschmidt's virtualenvmanager 
 
 class VirtualEnv(object):
@@ -578,7 +583,7 @@ class VirtualEnv(object):
         args = ['virtualenv', self.path]
         if not sitepackages:
             args.append('--no-site-packages')
-        subprocess.check_call(args)
+        subcall(args)
 
     def makegateway(self):
         python = self._cmd('python')
diff --git a/py/test/plugin/pytest_restdoc.py b/py/test/plugin/pytest_restdoc.py
index 427ae2dee..95928be10 100644
--- a/py/test/plugin/pytest_restdoc.py
+++ b/py/test/plugin/pytest_restdoc.py
@@ -105,12 +105,14 @@ class ReSTSyntaxTest(py.test.collect.Item):
 
     def register_pygments(self):
         # taken from pygments-main/external/rst-directive.py 
+        from docutils.parsers.rst import directives
         try:
             from pygments.formatters import HtmlFormatter
         except ImportError:
             def pygments_directive(name, arguments, options, content, lineno,
                                    content_offset, block_text, state, state_machine):
                 return []
+            pygments_directive.options = {}
         else:
             # The default formatter
             DEFAULT = HtmlFormatter(noclasses=True)
@@ -120,7 +122,6 @@ class ReSTSyntaxTest(py.test.collect.Item):
             }
 
             from docutils import nodes
-            from docutils.parsers.rst import directives
 
             from pygments import highlight
             from pygments.lexers import get_lexer_by_name, TextLexer
@@ -137,10 +138,10 @@ class ReSTSyntaxTest(py.test.collect.Item):
                 parsed = highlight(u'\n'.join(content), lexer, formatter)
                 return [nodes.raw('', parsed, format='html')]
 
+            pygments_directive.options = dict([(key, directives.flag) for key in VARIANTS])
+
         pygments_directive.arguments = (1, 0, 1)
         pygments_directive.content = 1
-        pygments_directive.options = dict([(key, directives.flag) for key in VARIANTS])
-
         directives.register_directive('sourcecode', pygments_directive)
 
     def resolve_linkrole(self, name, text, check=True):
diff --git a/py/test/plugin/pytest_runner.py b/py/test/plugin/pytest_runner.py
index d3fa89381..df5d5f257 100644
--- a/py/test/plugin/pytest_runner.py
+++ b/py/test/plugin/pytest_runner.py
@@ -20,18 +20,11 @@ def pytest_configure(config):
     config._setupstate = SetupState()
 
 def pytest_sessionfinish(session, exitstatus):
-    # XXX see above
     if hasattr(session.config, '_setupstate'):
         hook = session.config.hook
         rep = hook.pytest__teardown_final(session=session)
         if rep:
             hook.pytest__teardown_final_logerror(rep=rep)
-    # prevent logging module atexit handler from choking on 
-    # its attempt to close already closed streams 
-    # see http://bugs.python.org/issue6333
-    mod = py.std.sys.modules.get("logging", None)
-    if mod is not None: 
-        mod.raiseExceptions = False 
 
 def pytest_make_collect_report(collector):
     result = excinfo = None

From b5115963ee6c85d3678fa284949010f82b95a2dc Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 31 Jul 2009 15:46:38 +0200
Subject: [PATCH 15/15] Added tag 1.0.0b9 for changeset e2a60653cb49

--HG--
branch : 1.0.x
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b8673e5d2..e7d4c2504 100644
--- a/.hgtags
+++ b/.hgtags
@@ -12,3 +12,4 @@
 c63f35c266cbb26dad6b87b5e115d65685adf448 1.0.0b8
 c63f35c266cbb26dad6b87b5e115d65685adf448 1.0.0b8
 0eaa0fdf2ba0163cf534dc2eff4ba2e5fc66c261 1.0.0b8
+e2a60653cb490aeed81bbbd83c070b99401c211c 1.0.0b9