From 512d2bd9507ad2fbfced5b7f1308a99030132116 Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Wed, 3 Aug 2022 13:34:25 +0900
Subject: [PATCH] MAINT Rename pytest_pyodide wrappers

---
 benchmark/benchmark.py           |  8 ++++----
 conftest.py                      | 15 +++------------
 packages/test_packages_common.py |  4 ++--
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py
index 0ccfe5a5b..c4e335472 100644
--- a/benchmark/benchmark.py
+++ b/benchmark/benchmark.py
@@ -9,8 +9,8 @@ from time import time
 sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
 
 from pytest_pyodide import (  # noqa: E402
-    SeleniumChromeWrapper,
-    SeleniumFirefoxWrapper,
+    SeleniumChromeRunner,
+    SeleniumFirefoxRunner,
     spawn_web_server,
 )
 
@@ -180,8 +180,8 @@ def main():
     results = {}
     selenium_backends = {}
     browser_cls = [
-        ("firefox", SeleniumFirefoxWrapper),
-        ("chrome", SeleniumChromeWrapper),
+        ("firefox", SeleniumFirefoxRunner),
+        ("chrome", SeleniumChromeRunner),
     ]
 
     with spawn_web_server(args.dist_dir) as (hostname, port, log_path):
diff --git a/conftest.py b/conftest.py
index 1fddcba88..36c9fb40e 100644
--- a/conftest.py
+++ b/conftest.py
@@ -12,15 +12,14 @@ DIST_PATH = ROOT_PATH / "dist"
 sys.path.append(str(ROOT_PATH / "pyodide-build"))
 sys.path.append(str(ROOT_PATH / "src" / "py"))
 
-import pytest_pyodide.browser
+import pytest_pyodide.runner
 from pytest_pyodide.utils import maybe_skip_test
 from pytest_pyodide.utils import package_is_built as _package_is_built
-from pytest_pyodide.utils import parse_xfail_browsers
 
 # There are a bunch of global objects that occasionally enter the hiwire cache
 # but never leave. The refcount checks get angry about them if they aren't preloaded.
 # We need to go through and touch them all once to keep everything okay.
-pytest_pyodide.browser.INITIALIZE_SCRIPT = """
+pytest_pyodide.runner.INITIALIZE_SCRIPT = """
     pyodide.globals.get;
     pyodide._api.pyodide_code.eval_code;
     pyodide._api.pyodide_code.eval_code_async;
@@ -144,15 +143,7 @@ def pytest_runtest_call(item):
             browser = item.funcargs[fixture]
             break
 
-    if not browser:
-        yield
-        return
-
-    xfail_msg = parse_xfail_browsers(item).get(browser.browser, None)
-    if xfail_msg is not None:
-        pytest.xfail(xfail_msg)
-
-    if not browser.pyodide_loaded:
+    if not browser or not browser.pyodide_loaded:
         yield
         return
 
diff --git a/packages/test_packages_common.py b/packages/test_packages_common.py
index 2af86a85e..fc215a7b7 100644
--- a/packages/test_packages_common.py
+++ b/packages/test_packages_common.py
@@ -2,7 +2,7 @@ import functools
 import os
 
 import pytest
-from pytest_pyodide import SeleniumWrapper
+from pytest_pyodide.runner import _BrowserBaseRunner
 
 from conftest import ROOT_PATH, package_is_built
 from pyodide_build.io import parse_package_config
@@ -44,7 +44,7 @@ def test_parse_package(name: str) -> None:
 @pytest.mark.skip_refcount_check
 @pytest.mark.driver_timeout(60)
 @pytest.mark.parametrize("name", registered_packages())
-def test_import(name: str, selenium_standalone: SeleniumWrapper) -> None:
+def test_import(name: str, selenium_standalone: _BrowserBaseRunner) -> None:
     if not package_is_built(name):
         raise AssertionError(
             "Implementation error. Test for an unbuilt package "