From 49631484825157968cafbff41580a0ede9572ecd Mon Sep 17 00:00:00 2001 From: hpk Date: Wed, 24 Jan 2007 22:11:24 +0100 Subject: [PATCH] [svn r37302] experimentally enable FD-based output capturing per-test --HG-- branch : trunk --- py/test/collect.py | 6 +++--- py/test/item.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/py/test/collect.py b/py/test/collect.py index c4a7a9861..2637aaa65 100644 --- a/py/test/collect.py +++ b/py/test/collect.py @@ -374,11 +374,11 @@ class Module(FSCollector, PyCollectorMixin): def startcapture(self): if not self.config.option.nocapture: assert not hasattr(self, '_capture') - #self._capture = py.io.OutErrCapture() + self._capture = py.io.OutErrCapture() # XXX integrate this into py.io / refactor # execnet/py.test capturing mechanisms - from py.__.misc.simplecapture import SimpleOutErrCapture - self._capture = SimpleOutErrCapture() + #from py.__.misc.simplecapture import SimpleOutErrCapture + #self._capture = SimpleOutErrCapture() def finishcapture(self): if hasattr(self, '_capture'): diff --git a/py/test/item.py b/py/test/item.py index dd5e16a06..23e034946 100644 --- a/py/test/item.py +++ b/py/test/item.py @@ -33,9 +33,9 @@ class Item(py.test.collect.Collector): def startcapture(self): if not self.config.option.nocapture: # XXX refactor integrate capturing - #self._capture = py.io.OutErrCapture() - from py.__.misc.simplecapture import SimpleOutErrCapture - self._capture = SimpleOutErrCapture() + self._capture = py.io.OutErrCapture() + #from py.__.misc.simplecapture import SimpleOutErrCapture + #self._capture = SimpleOutErrCapture() def finishcapture(self): if hasattr(self, '_capture'):