Replace pytester with older testdir fixture

Author: asvetlov

tests/hypothesis/test_base.py

@@ -7,6 +7,8 @@
 import pytest
 from hypothesis import given, strategies as st
 
+pytest_plugins = "testdir"
+
 
 @pytest.fixture(scope="module")
 def event_loop():
@@ -43,8 +45,8 @@ async def test_can_use_fixture_provided_event_loop(event_loop, n):
     await semaphore.acquire()
 
 
-def test_async_auto_marked(pytester):
-    pytester.makepyfile(
+def test_async_auto_marked(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -60,13 +62,13 @@ async def test_hypothesis(n: int):
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=auto")
+    result = testdir.runpytest("--asyncio-mode=auto")
     result.assert_outcomes(passed=1)
 
 
-def test_sync_not_auto_marked(pytester):
+def test_sync_not_auto_marked(testdir):
     """Assert that synchronous Hypothesis functions are not marked with asyncio"""
-    pytester.makepyfile(
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -84,5 +86,5 @@ def test_hypothesis(request, n: int):
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=auto")
+    result = testdir.runpytest("--asyncio-mode=auto")
     result.assert_outcomes(passed=1)

tests/modes/test_auto_mode.py

@@ -1,10 +1,10 @@
 from textwrap import dedent
 
-pytest_plugins = "pytester"
+pytest_plugins = "testdir"
 
 
-def test_auto_mode_cmdline(pytester):
-    pytester.makepyfile(
+def test_auto_mode_cmdline(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -17,12 +17,12 @@ async def test_a():
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=auto")
+    result = testdir.runpytest("--asyncio-mode=auto")
     result.assert_outcomes(passed=1)
 
 
-def test_auto_mode_cfg(pytester):
-    pytester.makepyfile(
+def test_auto_mode_cfg(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -35,13 +35,13 @@ async def test_a():
         """
         )
     )
-    pytester.makefile(".ini", pytest="[pytest]\nasyncio_mode = auto\n")
-    result = pytester.runpytest()
+    testdir.makefile(".ini", pytest="[pytest]\nasyncio_mode = auto\n")
+    result = testdir.runpytest()
     result.assert_outcomes(passed=1)
 
 
-def test_auto_mode_async_fixture(pytester):
-    pytester.makepyfile(
+def test_auto_mode_async_fixture(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -60,12 +60,12 @@ async def test_a(fixture_a):
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=auto")
+    result = testdir.runpytest("--asyncio-mode=auto")
     result.assert_outcomes(passed=1)
 
 
-def test_auto_mode_method_fixture(pytester):
-    pytester.makepyfile(
+def test_auto_mode_method_fixture(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -87,5 +87,5 @@ async def test_a(self, fixture_a):
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=auto")
+    result = testdir.runpytest("--asyncio-mode=auto")
     result.assert_outcomes(passed=1)

tests/modes/test_legacy_mode.py

@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-pytest_plugins = "pytester"
+pytest_plugins = "testdir"
 
 
 LEGACY_MODE = (
@@ -18,8 +18,8 @@
 ).format(name="*")
 
 
-def test_warning_for_legacy_mode_cmdline(pytester):
-    pytester.makepyfile(
+def test_warning_for_legacy_mode_cmdline(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -33,13 +33,13 @@ async def test_a():
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=legacy")
+    result = testdir.runpytest("--asyncio-mode=legacy")
     assert result.parseoutcomes()["warnings"] == 1
     result.stdout.fnmatch_lines(["*" + LEGACY_MODE + "*"])
 
 
-def test_warning_for_legacy_mode_cfg(pytester):
-    pytester.makepyfile(
+def test_warning_for_legacy_mode_cfg(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -53,15 +53,15 @@ async def test_a():
         """
         )
     )
-    pytester.makefile(".ini", pytest="[pytest]\nasyncio_mode = legacy\n")
-    result = pytester.runpytest()
+    testdir.makefile(".ini", pytest="[pytest]\nasyncio_mode = legacy\n")
+    result = testdir.runpytest()
     assert result.parseoutcomes()["warnings"] == 1
     result.stdout.fnmatch_lines(["*" + LEGACY_MODE + "*"])
     result.stdout.no_fnmatch_line("*" + LEGACY_ASYNCIO_FIXTURE + "*")
 
 
-def test_warning_for_legacy_fixture(pytester):
-    pytester.makepyfile(
+def test_warning_for_legacy_fixture(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -81,13 +81,13 @@ async def test_a(fixture_a):
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=legacy")
+    result = testdir.runpytest("--asyncio-mode=legacy")
     assert result.parseoutcomes()["warnings"] == 2
     result.stdout.fnmatch_lines(["*" + LEGACY_ASYNCIO_FIXTURE + "*"])
 
 
-def test_warning_for_legacy_method_fixture(pytester):
-    pytester.makepyfile(
+def test_warning_for_legacy_method_fixture(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -110,6 +110,6 @@ async def test_a(self, fixture_a):
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=legacy")
+    result = testdir.runpytest("--asyncio-mode=legacy")
     assert result.parseoutcomes()["warnings"] == 2
     result.stdout.fnmatch_lines(["*" + LEGACY_ASYNCIO_FIXTURE + "*"])

tests/modes/test_strict_mode.py

@@ -1,10 +1,10 @@
 from textwrap import dedent
 
-pytest_plugins = "pytester"
+pytest_plugins = "testdir"
 
 
-def test_strict_mode_cmdline(pytester):
-    pytester.makepyfile(
+def test_strict_mode_cmdline(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -18,12 +18,12 @@ async def test_a():
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=strict")
+    result = testdir.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=1)
 
 
-def test_strict_mode_cfg(pytester):
-    pytester.makepyfile(
+def test_strict_mode_cfg(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -37,13 +37,13 @@ async def test_a():
         """
         )
     )
-    pytester.makefile(".ini", pytest="[pytest]\nasyncio_mode = strict\n")
-    result = pytester.runpytest()
+    testdir.makefile(".ini", pytest="[pytest]\nasyncio_mode = strict\n")
+    result = testdir.runpytest()
     result.assert_outcomes(passed=1)
 
 
-def test_strict_mode_method_fixture(pytester):
-    pytester.makepyfile(
+def test_strict_mode_method_fixture(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -66,5 +66,5 @@ async def test_a(self, fixture_a):
         """
         )
     )
-    result = pytester.runpytest("--asyncio-mode=auto")
+    result = testdir.runpytest("--asyncio-mode=auto")
     result.assert_outcomes(passed=1)

tests/test_flaky_integration.py

@@ -4,11 +4,11 @@
 
 from textwrap import dedent
 
-pytest_plugins = "pytester"
+pytest_plugins = "testdir"
 
 
-def test_auto_mode_cmdline(pytester):
-    pytester.makepyfile(
+def test_auto_mode_cmdline(testdir):
+    testdir.makepyfile(
         dedent(
             """\
         import asyncio
@@ -29,7 +29,7 @@ async def test_asyncio_flaky_thing_that_fails_then_succeeds():
     )
     # runpytest_subprocess() is required to don't pollute the output
     # with flaky restart information
-    result = pytester.runpytest_subprocess()
+    result = testdir.runpytest_subprocess("--asyncio-mode=strict")
     result.assert_outcomes(passed=1)
     result.stdout.fnmatch_lines(
         [