Work on

Author: asvetlov

pytest_asyncio/_runner.py

@@ -29,13 +29,14 @@ def run_test(self, coro: Awaitable[None]) -> None:
             raise
 
     def set_timer(self, timeout: Union[int, float]) -> None:
-        assert self._timeout_hande is None
+        if self._timeout_hande is not None:
+            self._timeout_hande.cancel()
         self._timeout_reached = False
         self._timeout_hande = self._loop.call_later(timeout, self._on_timeout)
 
     def cancel_timer(self) -> None:
-        assert self._timeout_hande is not None
-        self._timeout_hande.cancel()
+        if self._timeout_hande is not None:
+            self._timeout_hande.cancel()
         self._timeout_reached = False
         self._timeout_hande = None
 

pytest_asyncio/plugin.py

@@ -294,6 +294,7 @@ def pytest_fixture_setup(
     if fixturedef.argname == "event_loop":
         outcome = yield
         loop = outcome.get_result()
+        print("\ninstall runner", request.node, id(request.node), id(loop))
         _install_runner(request.node, loop)
         policy = asyncio.get_event_loop_policy()
         try:

tests/test_timeout.py

@@ -10,10 +10,11 @@ def test_timeout_ok(pytester):
         import asyncio
         import pytest
 
-        pytest_plugins = 'pytest_asyncio'
+        pytest_plugins = ['pytest_asyncio']
 
-        @pytest.mark.asyncio(timeout=0.01)
         @pytest.mark.xfail(strict=True, raises=asyncio.TimeoutError)
+        @pytest.mark.timeout(0.01)
+        @pytest.mark.asyncio
         async def test_a():
             await asyncio.sleep(1)
         """
@@ -30,9 +31,10 @@ def test_timeout_disabled(pytester):
         import asyncio
         import pytest
 
-        pytest_plugins = 'pytest_asyncio'
+        pytest_plugins = ['pytest_asyncio']
 
-        @pytest.mark.asyncio(timeout=0)
+        @pytest.mark.timeout(0)
+        @pytest.mark.asyncio
         async def test_a():
             await asyncio.sleep(0.01)
         """
@@ -42,34 +44,14 @@ async def test_a():
     result.assert_outcomes(passed=1)
 
 
-def test_timeout_not_numeric(pytester):
-    pytester.makepyfile(
-        dedent(
-            """\
-        import asyncio
-        import pytest
-
-        pytest_plugins = 'pytest_asyncio'
-
-        @pytest.mark.asyncio(timeout="abc")
-        @pytest.mark.xfail(strict=True, raises=ValueError)
-        async def test_a():
-            await asyncio.sleep(0.01)
-        """
-        )
-    )
-    result = pytester.runpytest("--asyncio-mode=strict")
-    result.assert_outcomes(xfailed=1)
-
-
 def test_timeout_cmdline(pytester):
     pytester.makepyfile(
         dedent(
             """\
         import asyncio
         import pytest
 
-        pytest_plugins = 'pytest_asyncio'
+        pytest_plugins = ['pytest_asyncio']
 
         @pytest.mark.asyncio
         @pytest.mark.xfail(strict=True, raises=asyncio.TimeoutError)
@@ -78,26 +60,5 @@ async def test_a():
         """
         )
     )
-    result = pytester.runpytest("--asyncio-timeout=0.01", "--asyncio-mode=strict")
-    result.assert_outcomes(xfailed=1)
-
-
-def test_timeout_cfg(pytester):
-    pytester.makepyfile(
-        dedent(
-            """\
-        import asyncio
-        import pytest
-
-        pytest_plugins = 'pytest_asyncio'
-
-        @pytest.mark.asyncio
-        @pytest.mark.xfail(strict=True, raises=asyncio.TimeoutError)
-        async def test_a():
-            await asyncio.sleep(1)
-        """
-        )
-    )
-    pytester.makefile(".ini", pytest="[pytest]\nasyncio_timeout = 0.01\n")
-    result = pytester.runpytest("--asyncio-mode=strict")
+    result = pytester.runpytest("--timeout=0.01", "--asyncio-mode=strict")
     result.assert_outcomes(xfailed=1)