p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable capturing for setuponly output

This commit is contained in:
Steffen Allner 2016-06-22 12:14:35 +02:00
parent de9ed5e3f4
commit 2c6cfa42fa
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/python.py
View File

@ -2525,7 +2525,12 @@ class FixtureDef:
return result return result
def _log_fixture_stack(self, what): def _log_fixture_stack(self, what):
tw = self._fixturemanager.config.get_terminal_writer() config = self._fixturemanager.config
capman = config.pluginmanager.getplugin('capturemanager')
if capman:
capman.suspendcapture()
tw = config.get_terminal_writer()
tw.line() tw.line()
tw.write(' ' * 2 * self.scopenum) tw.write(' ' * 2 * self.scopenum)
tw.write('{step} {scope} {fixture}'.format( tw.write('{step} {scope} {fixture}'.format(
@ -2535,6 +2540,9 @@ class FixtureDef:
if hasattr(self, 'cached_param'): if hasattr(self, 'cached_param'):
tw.write('[{}]'.format(self.cached_param)) tw.write('[{}]'.format(self.cached_param))
if capman:
capman.resumecapture()
def __repr__(self): def __repr__(self):
return ("<FixtureDef name=%r scope=%r baseid=%r >" % return ("<FixtureDef name=%r scope=%r baseid=%r >" %
(self.argname, self.scope, self.baseid)) (self.argname, self.scope, self.baseid))