Merge branch 'master' into release-0.5.0

Author: pquentin

newsfragments/64.bugfix.rst

@@ -0,0 +1,2 @@
+The pytest 3.8.1 release broke pytest-trio's handling of trio tests
+defined as class methods. We fixed it again.

pytest_trio/_tests/conftest.py

@@ -1 +1,11 @@
+# Temporary hack while waiting for an answer here:
+#    https://github.com/pytest-dev/pytest/issues/4039
+import pytest
+import warnings
+warnings.filterwarnings(
+    "default",
+    category=pytest.RemovedInPytest4Warning,
+    message=".*non-top-level conftest.*",
+)
+
 pytest_plugins = ["pytester"]

pytest_trio/_tests/test_trio_asyncio.py

@@ -9,8 +9,8 @@
     pytestmark = pytest.mark.skip(reason="trio-asyncio not available")
 
 
-async def use_run_asyncio():
-    await trio_asyncio.run_asyncio(asyncio.sleep, 0)
+async def use_asyncio():
+    await trio_asyncio.aio_as_trio(asyncio.sleep)(0)
 
 
 @pytest.fixture()
@@ -23,29 +23,29 @@ async def asyncio_loop():
 @pytest.fixture()
 @async_generator
 async def asyncio_fixture_with_fixtured_loop(asyncio_loop):
-    await use_run_asyncio()
+    await use_asyncio()
     await yield_()
 
 
 @pytest.fixture()
 @async_generator
 async def asyncio_fixture_own_loop():
     async with trio_asyncio.open_loop():
-        await use_run_asyncio()
+        await use_asyncio()
         await yield_()
 
 
 @pytest.mark.trio
 async def test_no_fixture():
     async with trio_asyncio.open_loop():
-        await use_run_asyncio()
+        await use_asyncio()
 
 
 @pytest.mark.trio
 async def test_half_fixtured_asyncpg_conn(asyncio_fixture_own_loop):
-    await use_run_asyncio()
+    await use_asyncio()
 
 
 @pytest.mark.trio
 async def test_fixtured_asyncpg_conn(asyncio_fixture_with_fixtured_loop):
-    await use_run_asyncio()
+    await use_asyncio()

pytest_trio/plugin.py

@@ -292,7 +292,7 @@ async def run(self, test_ctx, contextvars_ctx):
 
 
 def _trio_test_runner_factory(item, testfunc=None):
-    testfunc = testfunc or item.function
+    testfunc = testfunc or item.obj
 
     if getattr(testfunc, '_trio_test_runner_wrapped', False):
         # We have already wrapped this, perhaps because we combined Hypothesis