parent
db4df5833a
commit
370daf0441
|
@ -153,7 +153,8 @@ class TerminalReporter:
|
|||
self.hasmarkup = self._tw.hasmarkup
|
||||
self.isatty = file.isatty()
|
||||
self._progress_items_reported = 0
|
||||
self._show_progress_info = self.config.getini('console_output_style') == 'progress'
|
||||
self._show_progress_info = (self.config.getoption('capture') != 'no' and
|
||||
self.config.getini('console_output_style') == 'progress')
|
||||
|
||||
def hasopt(self, char):
|
||||
char = {'xfailed': 'x', 'skipped': 's'}.get(char, char)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Use classic console output when -s is used.
|
|
@ -1037,3 +1037,11 @@ class TestProgress:
|
|||
r'\[gw\d\] \[\s*\d+%\] PASSED test_foo.py::test_foo\[1\]',
|
||||
r'\[gw\d\] \[\s*\d+%\] PASSED test_foobar.py::test_foobar\[1\]',
|
||||
])
|
||||
|
||||
def test_capture_no(self, many_tests_file, testdir):
|
||||
output = testdir.runpytest('-s')
|
||||
output.stdout.re_match_lines([
|
||||
r'test_bar.py \.{10}',
|
||||
r'test_foo.py \.{5}',
|
||||
r'test_foobar.py \.{5}',
|
||||
])
|
||||
|
|
Loading…
Reference in New Issue