Merge branch 'dev_pytest8'

Author: BerengerBerthoul

pytest_parallel/plugin.py

@@ -1,13 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+import os
 import sys
 import subprocess
 import tempfile
-import pytest
 from pathlib import Path
 import argparse
 import resource
+import pytest
+from _pytest.terminal import TerminalReporter
 
 # --------------------------------------------------------------------------
 def pytest_addoption(parser):
@@ -164,9 +166,16 @@ def pytest_configure(config):
 
     # only report to terminal if master process
     if not enable_terminal_reporter:
+        # unregister the stdout terminal reporter
         terminal_reporter = config.pluginmanager.getplugin('terminalreporter')
         config.pluginmanager.unregister(terminal_reporter)
 
+        # Pytest relies on having a terminal reporter to decide on how to create error messages, see #12
+        # Hence, register a terminal reporter that outputs to /dev/null
+        null_file = open(os.devnull,'w')
+        terminal_reporter = TerminalReporter(config, null_file)
+        config.pluginmanager.register(terminal_reporter, "terminalreporter")
+
 
 # --------------------------------------------------------------------------
 @pytest.fixture

pytest_parallel/test/test_utils.py

@@ -5,18 +5,10 @@
 
 
 def test_group_items_by_parallel_steps():
-    class callspec_mock:
-        def __init__(self, n_proc):
-            self.n_proc = n_proc
-
-        def getparam(self, s):
-            assert s == "comm"
-            return self.n_proc
-
     class item_mock:
-        def __init__(self, name, n_procs):
+        def __init__(self, name, n_proc):
             self.name = name
-            self.callspec = callspec_mock(n_procs)
+            self.n_proc = n_proc
 
     n_workers = 4
     items = [

source.sh

@@ -0,0 +1,50 @@
+[=]+ test session starts [=]+
+platform [^\n]*
+cachedir: [^\n]*
+?(?:metadata: [^\n]*)?
+rootdir: [^\n]*
+?(?:configfile: [^\n]*)?
+?(?:plugins: [^\n]*)?
+collecting ... [\s]*collected 1 item[\s]*
+?(?:Submitting tests to SLURM...)?
+?(?:SLURM job [^\n]* has been submitted)?
+
+[^\n]*test_fail_complex_assert_two_procs.py::test_fail_with_complex_assert_reporting\[2\] FAILED
+
+[=]+ FAILURES [=]+
+[_]+ test_fail_with_complex_assert_reporting\[2\] [_]+
+
+[-]+ On rank 0 of 2 [-]+
+comm = <mpi4py.MPI.Intracomm object at [^\n]*>
+
+    @pytest_parallel.mark.parallel\(2\)
+    def test_fail_with_complex_assert_reporting\(comm\):
+        if comm.Get_rank\(\) == 0:
+>           assert 1 == 0
+E           assert 1 == 0
+
+[^\n]*test_fail_complex_assert_two_procs.py:7: AssertionError
+
+[-]+ On rank 1 of 2 [-]+
+comm = <mpi4py.MPI.Intracomm object at [^\n]*>
+
+    @pytest_parallel.mark.parallel\(2\)
+    def test_fail_with_complex_assert_reporting\(comm\):
+        if comm.Get_rank\(\) == 0:
+            assert 1 == 0
+        if comm.Get_rank\(\) == 1:
+>           assert \(np.array\(\[0,1,2\]\) == np.array\(\[0,1,3\]\)\).all\(\)
+E           assert False
+E            \+  where False = <built-in method all of numpy\.ndarray object at [^\n]*>\(\)
+E            \+    where <built-in method all of numpy\.ndarray object at [^\n]*> = array\(\[0, 1, 2\]\) == array\(\[0, 1, 3\]\)
+?(?:[^\n]*)?
+E                 Full diff:
+E                 - array\(\[0, 1, 3\]\)
+E                 \?              \^
+E                 \+ array\(\[0, 1, 2\]\)
+E                 \?              \^.all
+
+[^\n]*test_fail_complex_assert_two_procs.py:9: AssertionError
+[=]+ short test summary info [=]+
+FAILED [^\n]*test_fail_complex_assert_two_procs.py::test_fail_with_complex_assert_reporting\[2\][^\n]*
+[=]+ 1 failed in [^\n]*s [=]+

test/pytest_parallel_refs/terminal_fail_complex_assert_two_procs

@@ -3,6 +3,7 @@ platform [^\n]*
 cachedir: [^\n]*
 ?(?:metadata: [^\n]*)?
 rootdir: [^\n]*
+?(?:configfile: [^\n]*)?
 ?(?:plugins: [^\n]*)?
 collecting ... [\s]*collected 1 item[\s]*
 ?(?:Submitting tests to SLURM...)?

test/pytest_parallel_refs/terminal_fixture_error

@@ -3,6 +3,7 @@ platform [^\n]*
 cachedir: [^\n]*
 ?(?:metadata: [^\n]*)?
 rootdir: [^\n]*
+?(?:configfile: [^\n]*)?
 ?(?:plugins: [^\n]*)?
 collecting ... [\s]*collected 8 items[\s]*
 ?(?:Submitting tests to SLURM...)?

test/pytest_parallel_refs/terminal_parametrize

@@ -3,6 +3,7 @@ platform [^\n]*
 cachedir: [^\n]*
 ?(?:metadata: [^\n]*)?
 rootdir: [^\n]*
+?(?:configfile: [^\n]*)?
 ?(?:plugins: [^\n]*)?
 collecting ... [\s]*collected 8 items[\s]*
 ?(?:Submitting tests to SLURM...)?

test/pytest_parallel_refs/terminal_scheduling

@@ -3,6 +3,7 @@ platform [^\n]*
 cachedir: [^\n]*
 ?(?:metadata: [^\n]*)?
 rootdir: [^\n]*
+?(?:configfile: [^\n]*)?
 ?(?:plugins: [^\n]*)?
 collecting ... [\s]*collected 2 items[\s]*
 ?(?:Submitting tests to SLURM...)?

test/pytest_parallel_refs/terminal_seq

@@ -3,6 +3,7 @@ platform [^\n]*
 cachedir: [^\n]*
 ?(?:metadata: [^\n]*)?
 rootdir: [^\n]*
+?(?:configfile: [^\n]*)?
 ?(?:plugins: [^\n]*)?
 collecting ... [\s]*collected 1 item[\s]*
 ?(?:Submitting tests to SLURM...)?

test/pytest_parallel_refs/terminal_success_0_fail_1

@@ -3,6 +3,7 @@ platform [^\n]*
 cachedir: [^\n]*
 ?(?:metadata: [^\n]*)?
 rootdir: [^\n]*
+?(?:configfile: [^\n]*)?
 ?(?:plugins: [^\n]*)?
 collecting ... [\s]*collected 2 items[\s]*
 ?(?:Submitting tests to SLURM...)?