hpk42 / py-trunk / changeset / 0c6cafb6f4e6

@@ -248,6 +248,10 @@ class SetupState(object):
             if self.stack == needed_collectors[:len(self.stack)]:
                 break
             self._pop_and_teardown()
         # check if the last collection node has raised an error
         for col in self.stack:
             if hasattr(col, '_prepare_exc'):
                 py.builtin._reraise(*col._prepare_exc)
         for col in needed_collectors[len(self.stack):]:
             self.stack.append(col)
             try:
@@ -255,7 +259,3 @@ class SetupState(object):
             except Exception:
                 col._prepare_exc = sys.exc_info()
                 raise
         # check if the last collection node has raised an error
         for col in self.stack:
             if hasattr(col, '_prepare_exc'):
                 py.builtin._reraise(*col._prepare_exc)

@@ -186,5 +186,27 @@ def test_setup_fails_again_on_all_tests(
     ])
     assert "passed" not in result.stdout.str()
 def test_setup_funcarg_setup_not_called_if_outer_scope_fails(testdir):
     p = testdir.makepyfile("""
         import py
         def setup_module(mod):
             raise ValueError(42)
         def pytest_funcarg__hello(request):
             raise ValueError(43)
         def test_function1(hello):
             pass
         def test_function2(hello):
             pass
     """)
     result = testdir.runpytest(p)
     result.stdout.fnmatch_lines([
         "*function1*",
         "*ValueError*42*",
         "*function2*",
         "*ValueError*42*",
         "*2 error*"
     ])
     assert "43" not in result.stdout.str()