Skip to content

Commit f1ebe2e

Browse files
committed
[py] Update Firefox tests to use driver fixture
1 parent 65bb55f commit f1ebe2e

File tree

5 files changed

+17
-31
lines changed

5 files changed

+17
-31
lines changed

py/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ py_library(
363363
"test/selenium/webdriver/common/network.py",
364364
"test/selenium/webdriver/common/webserver.py",
365365
"test/selenium/webdriver/firefox/__init__.py",
366-
"test/selenium/webdriver/firefox/conftest.py",
367366
"test/selenium/webdriver/marionette/__init__.py",
368367
"test/selenium/webdriver/marionette/conftest.py",
369368
"test/selenium/webdriver/safari/conftest.py",

py/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ def clean_driver(request):
464464
pytest.xfail(**marker.kwargs)
465465

466466
yield driver_reference
467+
467468
if request.node.get_closest_marker("no_driver_after_test"):
468469
driver_reference = None
469470

py/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ classifiers = [
2424
"Programming Language :: Python :: 3.11",
2525
"Programming Language :: Python :: 3.12",
2626
"Programming Language :: Python :: 3.13",
27-
]
27+
]
2828
dependencies = [
2929
"urllib3[socks]>=2.5.0,<3.0",
3030
"trio>=0.30.0,<1.0",
3131
"trio-websocket>=0.12.2,<1.0",
3232
"certifi>=2025.6.15",
3333
"typing_extensions>=4.14.0,<5.0",
3434
"websocket-client>=1.8.0,<2.0",
35-
]
35+
]
3636

3737
[project.urls]
3838
homepage = "https://www.selenium.dev"

py/test/selenium/webdriver/firefox/conftest.py

Lines changed: 0 additions & 27 deletions
This file was deleted.

py/test/selenium/webdriver/firefox/ff_installs_addons_tests.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,21 @@
1818
import os
1919
import zipfile
2020

21+
import pytest
22+
2123
from selenium.webdriver.common.by import By
2224
from selenium.webdriver.support.wait import WebDriverWait
2325

24-
extensions = os.path.abspath("../../../../../../test/extensions/")
26+
for extensions_dir in (
27+
os.path.abspath("../../../../../../test/extensions/"),
28+
os.path.abspath("../common/extensions/"),
29+
):
30+
extensions = extensions_dir
31+
if os.path.exists(extensions_dir):
32+
break
2533

2634

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

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

4352

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

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

6070

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

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

7788

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

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

98110

111+
@pytest.mark.no_driver_after_test
99112
def test_install_uninstall_unsigned_addon_dir(driver, pages):
100113
zip = os.path.join(extensions, "webextensions-selenium-example-unsigned.zip")
101114
target = os.path.join(extensions, "webextensions-selenium-example-unsigned-unzip")

0 commit comments

Comments
 (0)