Use classic console output when -s is used

Fixes pytest-dev#3038
segevfiner · Dec 16, 2017 · a7fafbf · a7fafbf
1 parent db4df58
commit a7fafbf
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/_pytest/terminal.py b/_pytest/terminal.py
@@ -153,7 +153,8 @@ def __init__(self, config, file=None):
         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)