Pytest stdout capturing

brownie/_cli/test.py

@@ -21,6 +21,7 @@
   --network [name]         Use a specific network (default {CONFIG['network']['default']})
 
 Pytest Options:
+  -s                       Disable stdout capture when running tests
   -n [numprocesses]        Number of workers to use for xdist distributed testing,
                            set to 'auto' for automatic detection of number of CPUs
   --durations [num]        show slowest setup/test durations (num=0 for all)

brownie/test/managers/runner.py

@@ -1,6 +1,8 @@
 #!/usr/bin/python3
 
+import builtins
 import json
+import sys
 import warnings
 
 import pytest
@@ -10,6 +12,7 @@
 from brownie.exceptions import VirtualMachineError
 from brownie.network.state import _get_current_dependencies
 from brownie.test import coverage, output
+from brownie.utils import color
 
 from .base import PytestBrownieBase
 from .utils import convert_outcome
@@ -56,11 +59,41 @@ def __exit__(self, exc_type, exc_value, traceback):
         ) from None
 
 
+class PytestPrinter:
+    """
+    Custom printer for test execution.
+
+    Produces more-readable output when stdout capture is disabled.
+    """
+
+    _builtins_print = builtins.print
+
+    def start(self):
+        self.first_line = True
+        builtins.print = self
+
+    def __call__(self, text):
+        if self.first_line:
+            self.first_line = False
+            sys.stdout.write(f"{color('yellow')}RUNNING{color}\n")
+        sys.stdout.write(f"{text}\n")
+        sys.stdout.flush()
+
+    def finish(self, nodeid):
+        if not self.first_line:
+            sys.stdout.write(f"{nodeid} ")
+            sys.stdout.flush()
+        builtins.print = self._builtins_print
+
+
 class PytestBrownieRunner(PytestBrownieBase):
     def __init__(self, config, project):
         super().__init__(config, project)
         brownie.reverts = RevertContextManager
         pytest.reverts = revert_deprecation
+        self.printer = None
+        if config.getoption("capture") == "no":
+            self.printer = PytestPrinter()
 
     def pytest_generate_tests(self, metafunc):
         # module_isolation always runs before other module scoped functions
@@ -122,6 +155,9 @@ def _make_nodemap(self, ids):
 
     def pytest_runtest_protocol(self, item):
         # does not run on master
+        if self.printer:
+            self.printer.start()
+
         path, test = self._test_id(item.nodeid)
         if path not in self.results:
             if path in self.tests and ARGV["update"]:
@@ -164,6 +200,10 @@ def pytest_runtest_logreport(self, report):
             "results": "".join(self.results[path]),
         }
 
+    def pytest_report_teststatus(self, report):
+        if self.printer and report.when == "call":
+            self.printer.finish(report.nodeid)
+
     def pytest_sessionfinish(self):
         self._sessionfinish("build/tests.json")
         if ARGV["gas"]:

brownie/test/plugin.py

@@ -43,6 +43,10 @@ def pytest_configure(config):
         active_project.load_config()
         active_project._add_to_main_namespace()
 
+        # enable verbose output if stdout capture is disabled
+        if config.getoption("capture") == "no":
+            config.option.verbose = True
+
         if config.getoption("numprocesses"):
             Plugin = PytestBrownieMaster
         elif hasattr(config, "workerinput"):

tests/test/plugin/test_output.py

@@ -7,6 +7,7 @@
 test_source = """
 def test_stuff(BrownieTester, accounts):
     c = accounts[0].deploy(BrownieTester, True)
+    print('oh hai mark')
     c.doNothing({'from': accounts[0]})"""
 
 
@@ -41,3 +42,11 @@ def test_coverage_save_report(plugintester):
     next(path.glob("*")).open("w").write("this isn't json, is it?")
     plugintester.runpytest("-C")
     assert [i.name for i in path.glob("*")] == ["coverage.json"]
+
+
+def test_stdout_capture(plugintester):
+    result = plugintester.runpytest("-s")
+    output = result.stdout.str()
+
+    assert output.count("::test_stuff") == 2
+    assert "oh hai mark" in output