Fix tests

Author: nicoddemus

_pytest/terminal.py

@@ -51,6 +51,10 @@ def pytest_addoption(parser):
                      choices=['yes', 'no', 'auto'],
                      help="color terminal output (yes/no/auto).")
 
+    parser.addini("console_output_style",
+                  help="console output: classic or with additional progress information.",
+                  default='progress')
+
 
 def pytest_configure(config):
     config.option.verbose -= config.option.quiet
@@ -148,6 +152,7 @@ def __init__(self, config, file=None):
         self.hasmarkup = self.writer.hasmarkup
         self.isatty = file.isatty()
         self._progress_items_reported = 0
+        self._show_progress_info = self.config.getini('console_output_style') == 'progress'
 
     @property
     def writer(self):
@@ -301,6 +306,8 @@ def pytest_runtest_logreport(self, report):
                 self.currentfspath = -2
 
     def _write_progress_if_past_edge(self):
+        if not self._show_progress_info:
+            return
         last_item = self._progress_items_reported == self._session.testscollected
         if last_item:
             self._write_progress_information_filling_space()
@@ -318,6 +325,8 @@ def _get_progress_information_message(self):
         return ' [{:3d}%]'.format(progress)
 
     def _write_progress_information_filling_space(self):
+        if not self._show_progress_info:
+            return
         msg = self._get_progress_information_message()
         fill = ' ' * (self.writer.fullwidth - self.writer.chars_on_current_line - len(msg) - 1)
         self.write(fill + msg, cyan=True)

testing/acceptance_test.py

@@ -630,18 +630,18 @@ def join_pythonpath(*dirs):
         testdir.chdir()
         assert result.ret == 0
         result.stdout.fnmatch_lines([
-            "*test_hello.py::test_hello*PASSED",
-            "*test_hello.py::test_other*PASSED",
-            "*test_world.py::test_world*PASSED",
-            "*test_world.py::test_other*PASSED",
+            "*test_hello.py::test_hello*PASSED*",
+            "*test_hello.py::test_other*PASSED*",
+            "*test_world.py::test_world*PASSED*",
+            "*test_world.py::test_other*PASSED*",
             "*4 passed*"
         ])
 
         # specify tests within a module
         result = testdir.runpytest("--pyargs", "-v", "ns_pkg.world.test_world::test_other")
         assert result.ret == 0
         result.stdout.fnmatch_lines([
-            "*test_world.py::test_other*PASSED",
+            "*test_world.py::test_other*PASSED*",
             "*1 passed*"
         ])
 

testing/python/fixture.py

@@ -2119,6 +2119,10 @@ def test_2(arg):
         assert values == [1, 1, 2, 2]
 
     def test_module_parametrized_ordering(self, testdir):
+        testdir.makeini("""
+            [pytest]
+            console_output_style=classic
+        """)
         testdir.makeconftest("""
             import pytest
 
@@ -2165,6 +2169,10 @@ def test_func4(marg):
         """)
 
     def test_class_ordering(self, testdir):
+        testdir.makeini("""
+            [pytest]
+            console_output_style=classic
+        """)
         testdir.makeconftest("""
             import pytest
 

testing/python/metafunc.py

@@ -960,6 +960,10 @@ def test_func(arg2):
         ])
 
     def test_parametrize_with_ids(self, testdir):
+        testdir.makeini("""
+            [pytest]
+            console_output_style=classic
+        """)
         testdir.makepyfile("""
             import pytest
             def pytest_generate_tests(metafunc):

testing/test_terminal.py

@@ -147,7 +147,7 @@ class TestMore(BaseTests):
         ])
         result = testdir.runpytest("-v", p2)
         result.stdout.fnmatch_lines([
-            "*test_p2.py::TestMore::test_p1* <- *test_p1.py*PASSED",
+            "*test_p2.py::TestMore::test_p1* <- *test_p1.py*PASSED*",
         ])
 
     def test_itemreport_directclasses_not_shown_as_subclasses(self, testdir):