Merge remote-tracking branch 'upstream/master' into merge-upstream

2018-02-17 09:38:06 -02:00
parent dfbaa20240 00d3001138
commit 69d608aec3
25 changed files with 201 additions and 38 deletions
--- a/_pytest/logging.py
+++ b/_pytest/logging.py
@@ -504,7 +504,7 @@ class _LiveLoggingStreamHandler(logging.StreamHandler):
                if not self._test_outcome_written:
                    self._test_outcome_written = True
                    self.stream.write('\n')
-            if not self._section_name_shown:
+            if not self._section_name_shown and self._when:
                self.stream.section('live log ' + self._when, sep='-', bold=True)
                self._section_name_shown = True
            logging.StreamHandler.emit(self, record)