Fixes to pass trio-asyncio specific tests locally

Author: oremanj

tests/interop/test_adapter.py

@@ -10,12 +10,13 @@
 import warnings
 from async_generator import asynccontextmanager
 from .. import utils as test_utils
+from trio_asyncio import TrioAsyncioDeprecationWarning
 
 
 def de_deprecate_converter(func):
     def wrapper(proc):
         with warnings.catch_warnings():
-            warnings.simplefilter('ignore', DeprecationWarning)
+            warnings.simplefilter('ignore', TrioAsyncioDeprecationWarning)
             return func(proc)
 
     return wrapper

tests/test_aio_subprocess.py

@@ -386,10 +386,12 @@ async def run_subprocess_wait_no_same_group(loop):
         stderr=None,
         start_new_session=True
     )
-    _, proto = await connect
+    transp, proto = await connect
     assert isinstance(proto, MySubprocessProtocol)
     await proto.completed
     assert 7 == proto.returncode
+    with test_utils.disable_logger():
+        transp.close()
 
 
 @pytest.mark.trio

tests/utils.py

@@ -6,7 +6,12 @@
 import logging
 from asyncio.log import logger
 
-def deprecate(tc, vers=None):
+from trio_asyncio import TrioAsyncioDeprecationWarning
+
+def deprecate(tc):
+    return pytest.warns(TrioAsyncioDeprecationWarning)
+
+def deprecate_stdlib(tc, vers=None):
     if vers is None or sys.version_info >= vers:
         return pytest.deprecated_call()
 

trio_asyncio/_adapter.py

@@ -190,9 +190,11 @@ def trio_as_aio(proc, *, loop=None):
 trio_as_asyncio = trio_as_aio
 
 
+_shim_running = ContextVar("shim_running", default=False)
+
 @types.coroutine
 def _allow_asyncio(fn, *args):
-    shim = trio_asyncio.base._shim_running
+    shim = _shim_running
     shim.set(True)
 
     coro = fn(*args)
@@ -217,8 +219,6 @@ def _allow_asyncio(fn, *args):
             p, a = coro.send, next_send
 
 
-_shim_running = ContextVar("shim_running", default=False)
-
 async def allow_asyncio(fn, *args):
     """
     This wrapper allows you to indiscrimnately mix :mod:`trio` and

trio_asyncio/_base.py

@@ -12,6 +12,7 @@
 from ._handles import Handle, TimerHandle
 from ._util import run_aio_future, run_aio_generator
 from ._deprecate import deprecated, deprecated_alias
+from . import _util
 
 from selectors import _BaseSelectorImpl, EVENT_READ, EVENT_WRITE
 
@@ -790,7 +791,7 @@ def __exit__(self, *tb):
     run_future = staticmethod(
         deprecated_alias(
             "trio_asyncio.BaseTrioEventLoop.run_future",
-            run_aio_future,
+            _util.run_aio_future,
             "0.10.0",
             issue=38,
         )

trio_asyncio/_loop.py

@@ -128,7 +128,7 @@ def new_event_loop(self):
                 instead=None,
             )
 
-        from .sync import SyncTrioEventLoop
+        from ._sync import SyncTrioEventLoop
         return SyncTrioEventLoop()
 
     def get_event_loop(self):