Skip to content

webdriver: Fix outdated timeouts test and remove redundant check #56959

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
servo-wpt-sync merged 6 commits into from
Jan 5, 2026
Merged

webdriver: Fix outdated timeouts test and remove redundant check #56959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4aa5e4a
Update outdated WPT
yezhizhen Jan 5, 2026
4941677
Use cartesian product to test combinations
yezhizhen Jan 5, 2026
7b4636b
Update invalid timeout tests
yezhizhen Jan 5, 2026
630676d
Use the closest invalid value
yezhizhen Jan 5, 2026
41b9fe9
Rename + Add `test_invalid_timeouts_type`
yezhizhen Jan 5, 2026
9bee018
Update neglected tests
yezhizhen Jan 5, 2026
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 webdriver/tests/classic/new_session/support/create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
{"page load": 10},
{" pageLoad": 10},
{"pageLoad ": 10},
{"pageLoad": None},
{"pageLoad": False},
{"pageLoad": []},
{"pageLoad": "10"},
Expand Down
43 changes: 29 additions & 14 deletions webdriver/tests/classic/new_session/timeouts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from tests.support.asserts import assert_success, assert_error

MAX_SAFE_INTEGER = 2**53 - 1

def test_default_values(session):
timeouts = session.capabilities["timeouts"]
Expand All @@ -11,22 +12,36 @@ def test_default_values(session):
assert timeouts["script"] == 30000


@pytest.mark.parametrize("timeouts", [
{"implicit": 444, "pageLoad": 300000,"script": 30000},
{"implicit": 0, "pageLoad": 444,"script": 30000},
{"implicit": 0, "pageLoad": 300000,"script": 444},
{"implicit": 0, "pageLoad": 300000,"script": None},
])
def test_timeouts(new_session, add_browser_capabilities, timeouts):
@pytest.mark.parametrize("value", [None, 0, 3000])
@pytest.mark.parametrize("key", ["implicit", "pageLoad", "script"])
def test_timeouts(new_session, add_browser_capabilities, key, value):
timeouts = {key: value}
response, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilities({"timeouts": timeouts})}})
value = assert_success(response)
assert value["capabilities"]["timeouts"] == timeouts

@pytest.mark.parametrize("timeouts", [
{"implicit": None, "pageLoad": 300000,"script": 30000},
{"implicit": 0, "pageLoad": None,"script": 30000},
{"implicit": None, "pageLoad": None,"script": None}
])
def test_invalid_timeouts(new_session, add_browser_capabilities, timeouts):
response, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilities({"timeouts": timeouts})}})
@pytest.mark.parametrize("value", [MAX_SAFE_INTEGER + 1, -1])
@pytest.mark.parametrize("key", ["implicit", "pageLoad", "script"])
def test_invalid_timeouts_value(new_session, add_browser_capabilities, key, value):
timeouts = {key: value}

response, _ = new_session({
"capabilities": {
"alwaysMatch": add_browser_capabilities({"timeouts": timeouts})
}
})

assert_error(response, "invalid argument")

@pytest.mark.parametrize("value", ["foo", False, [], {}])
@pytest.mark.parametrize("key", ["implicit", "pageLoad", "script"])
def test_invalid_timeouts_type(new_session, add_browser_capabilities, key, value):
timeouts = {key: value}

response, _ = new_session({
"capabilities": {
"alwaysMatch": add_browser_capabilities({"timeouts": timeouts})
}
})

assert_error(response, "invalid argument")