Skip to content

[py] Update internal Firefox tests to use driver fixture #16441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 16, 2025
+17 −31
Merged

[py] Update internal Firefox tests to use driver fixture #16441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f1ebe2e
[py] Update Firefox tests to use driver fixture
cgoldberg Oct 15, 2025
bcab315
Merge branch 'trunk' into py-firefox-driver-fixture
cgoldberg Oct 15, 2025
0641725
[py] Support Python 3.14 and drop Python 3.9 (#16342)
cgoldberg Oct 15, 2025
d677cc8
Fix merge conflicts
cgoldberg Oct 15, 2025
895f6ab
Merge branch 'SeleniumHQ:trunk' into py-firefox-driver-fixture
cgoldberg Oct 15, 2025
af73fbb
Merge branch 'SeleniumHQ:trunk' into py-firefox-driver-fixture
cgoldberg Oct 15, 2025
aebb7b8
Merge branch 'trunk' into py-firefox-driver-fixture
cgoldberg Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion py/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ py_library(
"test/selenium/webdriver/common/network.py",
"test/selenium/webdriver/common/webserver.py",
"test/selenium/webdriver/firefox/__init__.py",
"test/selenium/webdriver/firefox/conftest.py",
"test/selenium/webdriver/marionette/__init__.py",
"test/selenium/webdriver/marionette/conftest.py",
"test/selenium/webdriver/safari/conftest.py",
Expand Down
1 change: 1 addition & 0 deletions py/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ def clean_driver(request):
pytest.xfail(**marker.kwargs)

yield driver_reference

if request.node.get_closest_marker("no_driver_after_test"):
driver_reference = None

Expand Down
4 changes: 2 additions & 2 deletions py/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
]
]
dependencies = [
"urllib3[socks]>=2.5.0,<3.0",
"trio>=0.31.0,<1.0",
"trio-websocket>=0.12.2,<1.0",
"certifi>=2025.10.5",
"typing_extensions>=4.15.0,<5.0",
"websocket-client>=1.8.0,<2.0",
]
]

[project.urls]
homepage = "https://www.selenium.dev"
Expand Down
27 changes: 0 additions & 27 deletions py/test/selenium/webdriver/firefox/conftest.py
View file
Open in desktop

This file was deleted.

15 changes: 14 additions & 1 deletion py/test/selenium/webdriver/firefox/ff_installs_addons_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,21 @@
import os
import zipfile

import pytest

from selenium.webdriver.common.by import By
from selenium.webdriver.support.wait import WebDriverWait

extensions = os.path.abspath("../../../../../../test/extensions/")
for extensions_dir in (
os.path.abspath("../../../../../../test/extensions/"),
os.path.abspath("../common/extensions/"),
):
extensions = extensions_dir
if os.path.exists(extensions_dir):
break


@pytest.mark.no_driver_after_test
def test_install_uninstall_signed_addon_xpi(driver, pages):
extension = os.path.join(extensions, "webextensions-selenium-example.xpi")

Expand All @@ -41,6 +50,7 @@ def test_install_uninstall_signed_addon_xpi(driver, pages):
assert len(driver.find_elements(By.ID, "webextensions-selenium-example")) == 0


@pytest.mark.no_driver_after_test
def test_install_uninstall_signed_addon_zip(driver, pages):
extension = os.path.join(extensions, "webextensions-selenium-example.zip")

Expand All @@ -58,6 +68,7 @@ def test_install_uninstall_signed_addon_zip(driver, pages):
assert len(driver.find_elements(By.ID, "webextensions-selenium-example")) == 0


@pytest.mark.no_driver_after_test
def test_install_uninstall_unsigned_addon_zip(driver, pages):
extension = os.path.join(extensions, "webextensions-selenium-example-unsigned.zip")

Expand All @@ -75,6 +86,7 @@ def test_install_uninstall_unsigned_addon_zip(driver, pages):
assert len(driver.find_elements(By.ID, "webextensions-selenium-example")) == 0


@pytest.mark.no_driver_after_test
def test_install_uninstall_signed_addon_dir(driver, pages):
zip = os.path.join(extensions, "webextensions-selenium-example.zip")

Expand All @@ -96,6 +108,7 @@ def test_install_uninstall_signed_addon_dir(driver, pages):
assert len(driver.find_elements(By.ID, "webextensions-selenium-example")) == 0


@pytest.mark.no_driver_after_test
def test_install_uninstall_unsigned_addon_dir(driver, pages):
zip = os.path.join(extensions, "webextensions-selenium-example-unsigned.zip")
target = os.path.join(extensions, "webextensions-selenium-example-unsigned-unzip")
Expand Down
Loading