floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move logic determining if progress should be displayed to a function

This commit is contained in:
Bruno Oliveira 2018-01-12 07:04:43 -02:00
parent 5939b336cd
commit abbdb60051
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_pytest/terminal.py
View File

@ -153,8 +153,17 @@ class TerminalReporter:
self.hasmarkup = self._tw.hasmarkup self.hasmarkup = self._tw.hasmarkup
self.isatty = file.isatty() self.isatty = file.isatty()
self._progress_nodeids_reported = set() self._progress_nodeids_reported = set()
self._show_progress_info = (self.config.getoption('capture') != 'no' and not self.config.getoption('setupshow') self._show_progress_info = self._determine_show_progress_info()
and self.config.getini('console_output_style') == 'progress')
def _determine_show_progress_info(self):
"""Return True if we should display progress information based on the current config"""
# do not show progress if we are not capturing output (#3038)
if self.config.getoption('capture') == 'no':
return False
# do not show progress if we are showing fixture setup/teardown
if self.config.getoption('setupshow'):
return False
return self.config.getini('console_output_style') == 'progress'
def hasopt(self, char): def hasopt(self, char):
char = {'xfailed': 'x', 'skipped': 's'}.get(char, char) char = {'xfailed': 'x', 'skipped': 's'}.get(char, char)