fixes

microsoft · Nov 7, 2024 · a2ea58f · a2ea58f
1 parent 4473e0c
commit a2ea58f
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 34 deletions.
diff --git a/local-requirements.txt b/local-requirements.txt
@@ -8,4 +8,4 @@ flake8==4.0.1
 pre-commit==2.19.0
 Django==4.2.16
 pytest-xdist==2.5.0
-pytest-asyncio==0.21.1
+pytest-asyncio==0.24.0
diff --git a/pytest_playwright/asyncio.py b/pytest_playwright/asyncio.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import asyncio
 import shutil
 import os
 import sys
@@ -188,7 +187,7 @@ def browser_context_args(
 
         return context_args
 
-    @pytest_asyncio.fixture()
+    @pytest_asyncio.fixture(loop_scope="session")
     async def _artifacts_recorder(
         self,
         request: pytest.FixtureRequest,
@@ -207,19 +206,12 @@ async def _artifacts_recorder(
         )
         await artifacts_recorder.did_finish_test(failed)
 
-    @pytest_asyncio.fixture(scope="session")
+    @pytest_asyncio.fixture(scope="session", loop_scope="session")
     async def playwright(self) -> AsyncGenerator[Playwright, None]:
         pw = await async_playwright().start()
         yield pw
         await pw.stop()
 
-    @pytest.fixture(scope="session")
-    def event_loop(self) -> Generator[asyncio.AbstractEventLoop, None, None]:
-        policy = asyncio.get_event_loop_policy()
-        loop = policy.new_event_loop()
-        yield loop
-        loop.close()
-
     @pytest.fixture(scope="session")
     def browser_type(self, playwright: Playwright, browser_name: str) -> BrowserType:
         return getattr(playwright, browser_name)
@@ -237,15 +229,15 @@ async def launch(**kwargs: Dict) -> Browser:
 
         return launch
 
-    @pytest_asyncio.fixture(scope="session")
+    @pytest_asyncio.fixture(scope="session", loop_scope="session")
     async def browser(
         self, launch_browser: Callable[[], Browser]
     ) -> AsyncGenerator[Browser, None]:
         browser = await launch_browser()
         yield browser
         await browser.close()
 
-    @pytest_asyncio.fixture
+    @pytest_asyncio.fixture(loop_scope="session")
     async def new_context(
         self,
         browser: Browser,
@@ -281,11 +273,11 @@ async def _close_wrapper(*args: Any, **kwargs: Any) -> None:
         for context in contexts.copy():
             await context.close()
 
-    @pytest_asyncio.fixture
+    @pytest_asyncio.fixture(loop_scope="session")
     async def context(self, new_context: CreateContextCallback) -> BrowserContext:
         return await new_context()
 
-    @pytest_asyncio.fixture
+    @pytest_asyncio.fixture(loop_scope="session")
     async def page(self, context: BrowserContext) -> Page:
         return await context.new_page()
 

diff --git a/setup.cfg b/setup.cfg
@@ -12,7 +12,7 @@ warn_unused_configs = True
 check_untyped_defs = True
 disallow_untyped_defs = True
 [tool:pytest]
-addopts = -p no:playwright --runpytest subprocess -vv
+addopts = -p no:playwright -p no:asyncio --runpytest subprocess -vv
 testpaths =
     tests
 [coverage:run]

diff --git a/tests/test_async.py b/tests/test_async.py
@@ -18,6 +18,34 @@
 import pytest
 
 
+@pytest.fixture(autouse=True)
+def _set_default_ini_file(testdir: pytest.Testdir) -> None:
+    testdir.makeconftest(
+        """
+        import pytest
+
+        from pytest_asyncio import is_async_test
+
+        def pytest_collection_modifyitems(items):
+            pytest_asyncio_tests = (item for item in items if is_async_test(item))
+            session_scope_marker = pytest.mark.asyncio(loop_scope="session")
+            for async_test in pytest_asyncio_tests:
+                async_test.add_marker(session_scope_marker, append=False)
+        """
+    )
+
+
+def makeconftest(testdir: pytest.Testdir, content: str) -> None:
+    lines = content.split("\n")
+    spaces = [len(line) - len(line.lstrip()) for line in lines if line.strip()]
+    min_spaces = min(spaces) if spaces else 0
+    lines = [line[min_spaces:] for line in lines]
+
+    testdir.makeconftest(
+        testdir.tmpdir.join("conftest.py").read_text("utf8") + "\n" + "\n".join(lines)
+    )
+
+
 def test_default(testdir: pytest.Testdir) -> None:
     testdir.makepyfile(
         """
@@ -112,14 +140,13 @@ async def test_multiple_browsers(page):
 
 
 def test_browser_context_args(testdir: pytest.Testdir) -> None:
-    testdir.makeconftest(
+    makeconftest(
+        testdir,
         """
-        import pytest
-
         @pytest.fixture(scope="session")
         def browser_context_args():
             return {"user_agent": "foobar"}
-    """
+    """,
     )
     testdir.makepyfile(
         """
@@ -134,14 +161,15 @@ async def test_browser_context_args(page):
 
 
 def test_user_defined_browser_context_args(testdir: pytest.Testdir) -> None:
-    testdir.makeconftest(
+    makeconftest(
+        testdir,
         """
         import pytest
 
         @pytest.fixture(scope="session")
         def browser_context_args():
             return {"user_agent": "foobar"}
-    """
+    """,
     )
     testdir.makepyfile(
         """
@@ -159,14 +187,15 @@ async def test_browser_context_args(page):
 
 
 def test_user_defined_browser_context_args_clear_again(testdir: pytest.Testdir) -> None:
-    testdir.makeconftest(
+    makeconftest(
+        testdir,
         """
         import pytest
 
         @pytest.fixture(scope="session")
         def browser_context_args():
             return {"user_agent": "foobar"}
-    """
+    """,
     )
     testdir.makepyfile(
         """
@@ -428,15 +457,16 @@ async def test_base_url(page):
 
 
 def test_browser_context_args_device(testdir: pytest.Testdir) -> None:
-    testdir.makeconftest(
+    makeconftest(
+        testdir,
         """
         import pytest
 
         @pytest.fixture(scope="session")
         def browser_context_args(browser_context_args, playwright):
             iphone_11 = playwright.devices['iPhone 11 Pro']
             return {**browser_context_args, **iphone_11}
-    """
+    """,
     )
     testdir.makepyfile(
         """
@@ -451,7 +481,8 @@ async def test_browser_context_args(page):
 
 
 def test_launch_persistent_context_session(testdir: pytest.Testdir) -> None:
-    testdir.makeconftest(
+    makeconftest(
+        testdir,
         """
         import pytest_asyncio
         from playwright.sync_api import BrowserType
@@ -470,7 +501,7 @@ async def context(
             })
             yield context
             await context.close()
-    """
+    """,
     )
     testdir.makepyfile(
         """
@@ -485,7 +516,8 @@ async def test_browser_context_args(page):
 
 
 def test_context_page_on_session_level(testdir: pytest.Testdir) -> None:
-    testdir.makeconftest(
+    makeconftest(
+        testdir,
         """
         import pytest
         from playwright.sync_api import Browser, BrowserContext
@@ -509,7 +541,7 @@ async def page(
         ):
             page = await context.new_page()
             yield page
-    """
+    """,
     )
     testdir.makepyfile(
         """
@@ -529,7 +561,8 @@ async def test_b(page):
 
 
 def test_launch_persistent_context_function(testdir: pytest.Testdir) -> None:
-    testdir.makeconftest(
+    makeconftest(
+        testdir,
         """
         import pytest
         from playwright.sync_api import BrowserType
@@ -549,7 +582,7 @@ async def context(
             })
             yield context
             await context.close()
-    """
+    """,
     )
     testdir.makepyfile(
         """
@@ -751,11 +784,12 @@ def _assert_folder_structure(root: str, expected: str) -> None:
 
 
 def test_is_able_to_set_expect_timeout_via_conftest(testdir: pytest.Testdir) -> None:
-    testdir.makeconftest(
+    makeconftest(
+        testdir,
         """
         from playwright.async_api import expect
         expect.set_options(timeout=1111)
-    """
+    """,
     )
     testdir.makepyfile(
         """