add and use pytest marker - webextension in tests

Author: navin772

py/conftest.py

@@ -85,6 +85,13 @@ def pytest_addoption(parser):
     )
 
 
+def pytest_configure(config):
+    """Add custom markers for tests."""
+    config.addinivalue_line(
+        "markers", "webextension: mark test as requiring webextension support (for chromium based browsers)"
+    )
+
+
 def pytest_ignore_collect(collection_path, config):
     drivers_opt = config.getoption("drivers")
     _drivers = set(drivers).difference(drivers_opt or drivers)
@@ -167,21 +174,21 @@ def fin():
     global driver_instance
     if driver_instance is None:
         if driver_class == "Firefox":
-            options = get_options(driver_class, request.config)
+            options = get_options(driver_class, request.config, request)
             if platform.system() == "Linux":
                 # There are issues with window size/position when running Firefox
                 # under Wayland, so we use XWayland instead.
                 os.environ["MOZ_ENABLE_WAYLAND"] = "0"
         if driver_class == "Chrome":
-            options = get_options(driver_class, request.config)
+            options = get_options(driver_class, request.config, request)
         if driver_class == "Edge":
-            options = get_options(driver_class, request.config)
+            options = get_options(driver_class, request.config, request)
         if driver_class == "WebKitGTK":
-            options = get_options(driver_class, request.config)
+            options = get_options(driver_class, request.config, request)
         if driver_class == "WPEWebKit":
-            options = get_options(driver_class, request.config)
+            options = get_options(driver_class, request.config, request)
         if driver_class == "Remote":
-            options = get_options("Firefox", request.config) or webdriver.FirefoxOptions()
+            options = get_options("Firefox", request.config, request) or webdriver.FirefoxOptions()
             options.set_capability("moz:firefoxOptions", {})
             options.enable_downloads = True
         if driver_path is not None:
@@ -210,7 +217,7 @@ def fin():
         driver_instance = None
 
 
-def get_options(driver_class, config):
+def get_options(driver_class, config, request=None):
     browser_path = config.option.binary
     browser_args = config.option.args
     headless = config.option.headless
@@ -237,8 +244,13 @@ def get_options(driver_class, config):
         options.web_socket_url = True
         options.unhandled_prompt_behavior = "ignore"
 
-        # Enable webextensions for Chromium-based browsers when BiDi is enabled
-        if driver_class in ("Chrome", "Edge") and hasattr(options, "enable_webextensions"):
+        # Only enable webextensions for Chromium-based browsers when the test is marked with @pytest.mark.webextension
+        if (
+            request
+            and request.node.get_closest_marker("webextension")
+            and driver_class in ("Chrome", "Edge")
+            and hasattr(options, "enable_webextensions")
+        ):
             options.enable_webextensions = True
 
     return options
@@ -358,7 +370,7 @@ def clean_service(request):
 @pytest.fixture(scope="function")
 def clean_options(request):
     driver_class = get_driver_class(request.config.option.drivers[0])
-    yield get_options(driver_class, request.config)
+    yield get_options(driver_class, request.config, request)
 
 
 @pytest.fixture

py/test/selenium/webdriver/common/bidi_webextension_tests.py

@@ -60,10 +60,11 @@ def test_webextension_initialized(driver):
     assert driver.webextension is not None
 
 
+@pytest.mark.webextension
 def test_install_extension_path(driver, pages):
     """Test installing an extension from a directory path.
 
-    Note: For Chrome and Edge, webextensions are enabled when BiDi is used from conftest.py for this test.
+    Note: For Chrome and Edge, webextensions are enabled when the test is marked with @pytest.mark.webextension.
     You can also manually enable them using:
 
     from selenium.webdriver.chrome.options import Options
@@ -121,6 +122,7 @@ def test_install_base64_extension_path(driver, pages):
     uninstall_extension_and_verify_extension_uninstalled(driver, ext_info)
 
 
+@pytest.mark.webextension
 def test_install_unsigned_extension(driver, pages):
     """Test installing an unsigned extension."""
     path = os.path.join(extensions, "webextensions-selenium-example")
@@ -133,6 +135,7 @@ def test_install_unsigned_extension(driver, pages):
     uninstall_extension_and_verify_extension_uninstalled(driver, ext_info)
 
 
+@pytest.mark.webextension
 def test_install_with_extension_id_uninstall(driver, pages):
     """Test uninstalling an extension using just the extension ID."""
     path = os.path.join(extensions, EXTENSION_PATH)