summaryrefslogtreecommitdiffstats
path: root/testing/web-platform/mozilla/tests/webdriver/classic
diff options
context:
space:
mode:
Diffstat (limited to 'testing/web-platform/mozilla/tests/webdriver/classic')
-rw-r--r--testing/web-platform/mozilla/tests/webdriver/classic/new_session/conftest.py2
-rw-r--r--testing/web-platform/mozilla/tests/webdriver/classic/new_session/profile_root.py4
-rw-r--r--testing/web-platform/mozilla/tests/webdriver/classic/protocol/marionette_port.py3
3 files changed, 5 insertions, 4 deletions
diff --git a/testing/web-platform/mozilla/tests/webdriver/classic/new_session/conftest.py b/testing/web-platform/mozilla/tests/webdriver/classic/new_session/conftest.py
index 1cab6784c2..63abd19f6a 100644
--- a/testing/web-platform/mozilla/tests/webdriver/classic/new_session/conftest.py
+++ b/testing/web-platform/mozilla/tests/webdriver/classic/new_session/conftest.py
@@ -2,7 +2,7 @@ import pytest
from webdriver.transport import HTTPWireProtocol
-@pytest.fixture(name="configuration")
+@pytest.fixture(name="configuration", scope="session")
def fixture_configuration(configuration):
"""Remove "acceptInsecureCerts" from capabilities if it exists.
diff --git a/testing/web-platform/mozilla/tests/webdriver/classic/new_session/profile_root.py b/testing/web-platform/mozilla/tests/webdriver/classic/new_session/profile_root.py
index fc3607bed9..97cb835e2c 100644
--- a/testing/web-platform/mozilla/tests/webdriver/classic/new_session/profile_root.py
+++ b/testing/web-platform/mozilla/tests/webdriver/classic/new_session/profile_root.py
@@ -4,7 +4,7 @@ import os
import pytest
-def test_profile_root(tmp_path, configuration, geckodriver, user_prefs):
+def test_profile_root(tmp_path, configuration, geckodriver, default_preferences):
profile_path = os.path.join(tmp_path, "geckodriver-test")
os.makedirs(profile_path)
@@ -12,7 +12,7 @@ def test_profile_root(tmp_path, configuration, geckodriver, user_prefs):
# Pass all the wpt preferences from the default profile's user.js via
# capabilities to allow geckodriver to create a new valid profile itself.
- config["capabilities"]["moz:firefoxOptions"]["prefs"] = user_prefs
+ config["capabilities"]["moz:firefoxOptions"]["prefs"] = default_preferences
# Ensure we don't set a profile in command line arguments
del config["capabilities"]["moz:firefoxOptions"]["args"]
diff --git a/testing/web-platform/mozilla/tests/webdriver/classic/protocol/marionette_port.py b/testing/web-platform/mozilla/tests/webdriver/classic/protocol/marionette_port.py
index 09951abc43..20b4e03324 100644
--- a/testing/web-platform/mozilla/tests/webdriver/classic/protocol/marionette_port.py
+++ b/testing/web-platform/mozilla/tests/webdriver/classic/protocol/marionette_port.py
@@ -14,9 +14,10 @@ def test_marionette_port(geckodriver, port):
def test_marionette_port_outdated_active_port_file(
- configuration, geckodriver, custom_profile
+ configuration, create_custom_profile, geckodriver
):
config = deepcopy(configuration)
+ custom_profile = create_custom_profile()
extra_args = ["--marionette-port", "0"]
# Prepare a Marionette active port file that contains a port which will