Removed testing against the async generator wrapper

agronholm · agronholm · commit 00f6662ce8d6 · 2022-01-24T23:29:38.000+02:00
diff --git a/trio/_core/tests/test_ki.py b/trio/_core/tests/test_ki.py
@@ -138,79 +138,30 @@ def protected_manager():
 
 
 async def test_agen_protection():
-    @_core.enable_ki_protection
-    async def agen_protected1():
-        assert _core.currently_ki_protected()
-        try:
-            yield
-        finally:
-            assert _core.currently_ki_protected()
-
-    @_core.disable_ki_protection
-    async def agen_unprotected1():
-        assert not _core.currently_ki_protected()
-        try:
-            yield
-        finally:
-            assert not _core.currently_ki_protected()
-
-    # Swap the order of the decorators:
-    @_core.enable_ki_protection
-    async def agen_protected2():
-        assert _core.currently_ki_protected()
-        try:
-            yield
-        finally:
-            assert _core.currently_ki_protected()
-
-    @_core.disable_ki_protection
-    async def agen_unprotected2():
-        assert not _core.currently_ki_protected()
-        try:
-            yield
-        finally:
-            assert not _core.currently_ki_protected()
-
     # Native async generators
     @_core.enable_ki_protection
-    async def agen_protected3():
+    async def agen_protected():
         assert _core.currently_ki_protected()
         try:
             yield
         finally:
             assert _core.currently_ki_protected()
 
     @_core.disable_ki_protection
-    async def agen_unprotected3():
+    async def agen_unprotected():
         assert not _core.currently_ki_protected()
         try:
             yield
         finally:
             assert not _core.currently_ki_protected()
 
     for agen_fn in [
-        agen_protected1,
-        agen_protected2,
-        agen_protected3,
-        agen_unprotected1,
-        agen_unprotected2,
-        agen_unprotected3,
+        agen_protected,
+        agen_unprotected,
     ]:
         async for _ in agen_fn():  # noqa
             assert not _core.currently_ki_protected()
 
-        # asynccontextmanager insists that the function passed must itself be an
-        # async gen function, not a wrapper around one
-        if isasyncgenfunction(agen_fn):
-            async with contextlib.asynccontextmanager(agen_fn)():
-                assert not _core.currently_ki_protected()
-
-            # Another case that's tricky due to:
-            #   https://bugs.python.org/issue29590
-            with pytest.raises(KeyError):
-                async with contextlib.asynccontextmanager(agen_fn)():
-                    raise KeyError
-
 
 # Test the case where there's no magic local anywhere in the call stack
 def test_ki_disabled_out_of_context():
