Merge pull request #34 from touilleMan/async-gen-fixture-crash-teardown

Add test_async_yield_fixture_crashed_teardown_allow_other_teardowns

Author: touilleMan

pytest_trio/_tests/test_async_yield_fixture.py

@@ -261,3 +261,53 @@ async def test_actual_test(server):
     result = testdir.runpytest()
 
     result.assert_outcomes(passed=1)
+
+
+@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6")
+def test_async_yield_fixture_crashed_teardown_allow_other_teardowns(testdir):
+
+    testdir.makepyfile(
+        """
+        import pytest
+        import trio
+
+        events = []
+
+        @pytest.fixture
+        async def good_fixture():
+            async with trio.open_nursery() as nursery:
+                events.append('good_fixture setup')
+                yield
+                events.append('good_fixture teardown')
+
+        @pytest.fixture
+        async def bad_fixture():
+            async with trio.open_nursery() as nursery:
+                events.append('bad_fixture setup')
+                yield
+                events.append('bad_fixture teardown')
+                raise RuntimeError('Crash during fixture teardown')
+
+        def test_before():
+            assert not events
+
+        @pytest.mark.trio
+        async def test_actual_test(bad_fixture, good_fixture):
+            pass
+
+        def test_after():
+            assert events == [
+                'good_fixture setup',
+                'bad_fixture setup',
+                'bad_fixture teardown',
+                'good_fixture teardown',
+            ]
+    """
+    )
+
+    result = testdir.runpytest()
+
+    result.assert_outcomes(failed=1, passed=2)
+    result.stdout.re_match_lines(
+        [r'E\W+RuntimeError: Crash during fixture teardown']
+    )

pytest_trio/_tests/test_sync_fixture.py

@@ -87,3 +87,54 @@ def test_after():
     result = testdir.runpytest()
 
     result.assert_outcomes(passed=3)
+
+
+def test_sync_yield_fixture_crashed_teardown_allow_other_teardowns(testdir):
+
+    testdir.makepyfile(
+        """
+        import pytest
+        import trio
+
+        events = []
+
+        @pytest.fixture
+        async def force_async_fixture():
+            pass
+
+        @pytest.fixture
+        def good_fixture(force_async_fixture):
+            events.append('good_fixture setup')
+            yield
+            events.append('good_fixture teardown')
+
+        @pytest.fixture
+        def bad_fixture(force_async_fixture):
+            events.append('bad_fixture setup')
+            yield
+            events.append('bad_fixture teardown')
+            raise RuntimeError('Crash during fixture teardown')
+
+        def test_before():
+            assert not events
+
+        @pytest.mark.trio
+        async def test_actual_test(bad_fixture, good_fixture):
+            pass
+
+        def test_after():
+            assert events == [
+                'good_fixture setup',
+                'bad_fixture setup',
+                'bad_fixture teardown',
+                'good_fixture teardown',
+            ]
+    """
+    )
+
+    result = testdir.runpytest()
+
+    result.assert_outcomes(failed=1, passed=2)
+    result.stdout.re_match_lines(
+        [r'E\W+RuntimeError: Crash during fixture teardown']
+    )

pytest_trio/plugin.py

@@ -1,20 +1,24 @@
 """pytest-trio implementation."""
+import sys
 from traceback import format_exception
 from inspect import iscoroutinefunction, isgeneratorfunction
-try:
-    from inspect import isasyncgenfunction
-except ImportError:
-    # `inspect.isasyncgenfunction` not available with Python<3.6
-    def isasyncgenfunction(x):
-        return False
-
-
 import pytest
 import trio
 from trio._util import acontextmanager
 from trio.testing import MockClock, trio_test
 from async_generator import async_generator, yield_
 
+if sys.version_info >= (3, 6):
+    from inspect import isasyncgenfunction
+    ORDERED_DICTS = True
+else:
+    # `inspect.isasyncgenfunction` not available with Python<3.6
+    def isasyncgenfunction(x):
+        return False
+
+    # Ordered dict (and **kwargs) not available with Python<3.6
+    ORDERED_DICTS = False
+
 
 def pytest_configure(config):
     """Inject documentation."""
@@ -69,6 +73,9 @@ async def _setup_async_fixtures_in(deps):
     need_resolved_deps_stack = [
         (k, v) for k, v in deps.items() if isinstance(v, BaseAsyncFixture)
     ]
+    if not ORDERED_DICTS:
+        # Make the fixture resolution order determinist
+        need_resolved_deps_stack = sorted(need_resolved_deps_stack)
 
     if not need_resolved_deps_stack:
         await yield_(deps)
@@ -134,14 +141,15 @@ async def _setup(self, resolved_deps):
         __tracebackhide__ = True
         agen = self.fixturedef.func(**resolved_deps)
 
-        await yield_(await agen.asend(None))
-
         try:
-            await agen.asend(None)
-        except StopAsyncIteration:
-            pass
-        else:
-            raise RuntimeError('Only one yield in fixture is allowed')
+            await yield_(await agen.asend(None))
+        finally:
+            try:
+                await agen.asend(None)
+            except StopAsyncIteration:
+                pass
+            else:
+                raise RuntimeError('Only one yield in fixture is allowed')
 
 
 class SyncFixtureWithAsyncDeps(BaseAsyncFixture):
@@ -167,14 +175,15 @@ async def _setup(self, resolved_deps):
         __tracebackhide__ = True
         gen = self.fixturedef.func(**resolved_deps)
 
-        await yield_(gen.send(None))
-
         try:
-            gen.send(None)
-        except StopIteration:
-            pass
-        else:
-            raise RuntimeError('Only one yield in fixture is allowed')
+            await yield_(gen.send(None))
+        finally:
+            try:
+                gen.send(None)
+            except StopIteration:
+                pass
+            else:
+                raise RuntimeError('Only one yield in fixture is allowed')
 
 
 class AsyncFixture(BaseAsyncFixture):