imrpove

Signed-off-by: Bernat Gabor <[email protected]>

Author: gaborbernat

src/pytest_print/__init__.py

@@ -30,52 +30,49 @@ def pytest_addoption(parser):
 @pytest.fixture(name="printer", scope="function")
 def printer(request):
     """pytest plugin to print test progress steps in verbose mode"""
-    return _provide_printer(request)
+    return create_printer(request)
 
 
 @pytest.fixture(scope="session", name="printer_session")
 def printer_session(request):
-    return _provide_printer(request)
+    return create_printer(request)
 
 
-class State(object):
-    def __init__(self, print_relative_time):
-        self.first_call = True
-        self.start_datetime = datetime.now() if print_relative_time else None
-        self.print_relative_time = print_relative_time
+def create_printer(request):
+    if request.config.getoption("pytest_print_on") or request.config.getoption("verbose") > 0:
+        terminal_reporter = request.config.pluginmanager.getplugin("terminalreporter")
+        if terminal_reporter is not None:
+            state = State(request.config.getoption("pytest_print_relative_time"), terminal_reporter)
+            return state.print
 
-    @property
-    def elapsed(self):
-        if self.start_datetime is None:
-            return None
-        return (datetime.now() - self.start_datetime).total_seconds()
+    return no_op
 
-    __slots__ = ("first_call", "start_datetime", "print_relative_time")
 
+# noinspection PyUnusedLocal
+def no_op(msg):
+    """Do nothing"""
 
-def _provide_printer(request):
-    if request.config.getoption("pytest_print_on") and request.config.getoption("verbose") > 0:
-        terminal_reporter = request.config.pluginmanager.getplugin("terminalreporter")
-        if terminal_reporter is not None:
-            state = State(request.config.getoption("pytest_print_relative_time"))
-
-            def _print(msg):
-                if state.first_call:  # in case of the first call we don't have a new empty line, print it
-                    state.first_call = False
-                    terminal_reporter.write("\n")
 
-                terminal_reporter.write("\t")
+class State(object):
+    def __init__(self, print_relative, reporter):
+        self._reporter = reporter
+        self._start = datetime.now() if print_relative else None
+        self._print_relative = print_relative
 
-                if state.print_relative_time:
-                    terminal_reporter.write(str(state.elapsed))
-                    terminal_reporter.write("\t")
+    @property
+    def elapsed(self):
+        if self._start is None:
+            return None
+        return (datetime.now() - self._start).total_seconds()
 
-                terminal_reporter.write(msg)
-                terminal_reporter.write("\n")
+    def print(self, msg):
+        msg = "\t{}{}".format("{}\t".format(self.elapsed) if self._print_relative else "", msg)
+        self._reporter.write_line(msg)
 
-            return _print
+    def __repr__(self):
+        return "{}(print_relative={}, reporter={!r})".format(type(self).__name__, self._print_relative, self._reporter)
 
-    return lambda *args: None
+    __slots__ = ("_start", "_print_relative", "_reporter")
 
 
 __all__ = ("__version__",)

tests/example.py

@@ -1,5 +1,7 @@
 from time import sleep
 
+import pytest
+
 
 def create_virtual_environment():
     sleep(0.001)
@@ -13,7 +15,18 @@ def parallel_requests():
     sleep(0.001)
 
 
-def test_server_parallel_requests(printer, tmpdir):
+@pytest.fixture(scope="session")
+def expensive_setup(printer_session):
+    printer_session("attempt global peace")
+    yield
+    printer_session("teardown global peace")
+
+
+def test_global_peace(printer_session, expensive_setup):
+    printer_session("here we have global peace")
+
+
+def test_server_parallel_requests(printer, tmpdir, expensive_setup):
     printer("create virtual environment")
     create_virtual_environment()
 

tests/test_print.py

@@ -27,11 +27,11 @@ def test_progress_no_v(progress_report_example):
 
 
 def test_progress_v_no_relative(progress_report_example):
-    result_verbose = progress_report_example.runpytest("-v")
+    result_verbose = progress_report_example.runpytest("-v", "--print")
     result_verbose.assert_outcomes(passed=1)
 
     report_lines = [
-        "test_progress_v_no_relative.py::test_server_parallel_requests ",
+        "test_example.py::test_server_parallel_requests ",
         "\tcreate virtual environment",
         "\tstart server from virtual env",
         "\tdo the parallel request test",
@@ -42,9 +42,11 @@ def test_progress_v_no_relative(progress_report_example):
 
 def test_progress_v_relative(progress_report_example):
     result_verbose_relative = progress_report_example.runpytest("--print", "-v", "--print-relative-time")
+    out = "\n".join(result_verbose_relative.outlines)
     result_verbose_relative.assert_outcomes(passed=1)
 
     marker = "test_example.py::test_server_parallel_requests "
+    assert marker in result_verbose_relative.outlines, out
     from_index = result_verbose_relative.outlines.index(marker)
     output = (i.split("\t") for i in result_verbose_relative.outlines[from_index + 1 : from_index + 4])
     out = sorted([(float(relative), msg) for _, relative, msg in output])
@@ -53,7 +55,7 @@ def test_progress_v_relative(progress_report_example):
         "create virtual environment",
         "start server from virtual env",
         "do the parallel request test",
-    ]
+    ], out
 
 
 def test_progress_no_v_but_with_print_request(progress_report_example):

tox.ini

@@ -30,7 +30,7 @@ commands =
     coverage report
 
 [pytest]
-addopts = -ra --showlocals --runpytest=subprocess
+addopts = -ra --showlocals
 rsyncdirs = tests tox
 looponfailroots = tox tests
 testpaths = tests