Bug 1397912 - Split wdspec session creation tests for intermittent timeouts, r=ato
This test was timing out, so split it into firstMatch and alwaysMatch files.
MozReview-Commit-ID: 8E9wZQqdajG
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -309539,16 +309539,21 @@
{}
]
],
"webdriver/tests/sessions/new_session/conftest.py": [
[
{}
]
],
+ "webdriver/tests/sessions/new_session/support/create.py": [
+ [
+ {}
+ ]
+ ],
"webdriver/tests/state/__init__.py": [
[
{}
]
],
"webdriver/tests/state/text/__init__.py": [
[
{}
@@ -409226,19 +409231,27 @@
]
],
"webdriver/tests/retrieval/find_elements.py": [
[
"/webdriver/tests/retrieval/find_elements.py",
{}
]
],
- "webdriver/tests/sessions/new_session/create.py": [
- [
- "/webdriver/tests/sessions/new_session/create.py",
+ "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
+ [
+ "/webdriver/tests/sessions/new_session/create_alwaysMatch.py",
+ {
+ "timeout": "long"
+ }
+ ]
+ ],
+ "webdriver/tests/sessions/new_session/create_firstMatch.py": [
+ [
+ "/webdriver/tests/sessions/new_session/create_firstMatch.py",
{
"timeout": "long"
}
]
],
"webdriver/tests/sessions/new_session/default_values.py": [
[
"/webdriver/tests/sessions/new_session/default_values.py",
@@ -631633,18 +631646,22 @@
"webdriver/tests/retrieval/find_elements.py": [
"7df448c94c89bdb9f6818a69a9d52b21faa4b944",
"wdspec"
],
"webdriver/tests/sessions/new_session/conftest.py": [
"d2df38e506cb9a3e501f03fe03e2a31af42d6f04",
"support"
],
- "webdriver/tests/sessions/new_session/create.py": [
- "f47ffcbaf22af9f445e4202ebeaa03bb9415fbc9",
+ "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
+ "e4dd4fe4ab30d71e9fe383daf2ca00582615ec35",
+ "wdspec"
+ ],
+ "webdriver/tests/sessions/new_session/create_firstMatch.py": [
+ "6fd2671870cd3451aab6f81ea19bd516a6c82bc9",
"wdspec"
],
"webdriver/tests/sessions/new_session/default_values.py": [
"d0802053ea0e1c81304b985821c743727b5222ec",
"wdspec"
],
"webdriver/tests/sessions/new_session/invalid_capabilities.py": [
"20e143186f39022c0a8cf6218b08a2fe22f96153",
@@ -631653,16 +631670,20 @@
"webdriver/tests/sessions/new_session/merge.py": [
"e58b671da735c6040248c80a3384760ee4496c88",
"wdspec"
],
"webdriver/tests/sessions/new_session/response.py": [
"3eca8e1d571b0c94b2a08fccfbe8cb9f1b1ba6d5",
"wdspec"
],
+ "webdriver/tests/sessions/new_session/support/create.py": [
+ "440d88462cc418e4d5e1df6f73074d3a722bd2fd",
+ "support"
+ ],
"webdriver/tests/set_window_rect.py": [
"e84559c2ee94009fe808c3008c58e6e4b9ca27aa",
"wdspec"
],
"webdriver/tests/state/__init__.py": [
"da39a3ee5e6b4b0d3255bfef95601890afd80709",
"support"
],
deleted file mode 100644
--- a/testing/web-platform/tests/webdriver/tests/sessions/new_session/create.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#META: timeout=long
-
-import pytest
-
-from conftest import product, flatten
-
-
-# Note that we can only test things here all implementations must support
-valid_data = [
- ("acceptInsecureCerts", [False, None]),
- ("browserName", [None]),
- ("browserVersion", [None]),
- ("platformName", [None]),
- ("pageLoadStrategy", ["none", "eager", "normal", None]),
- ("proxy", [None]),
- ("unhandledPromptBehavior", ["dismiss", "accept", None]),
- ("test:extension", [True, "abc", 123, [], {"key": "value"}, None]),
-]
-
-
-@pytest.mark.parametrize("body", [lambda key, value: {"alwaysMatch": {key: value}},
- lambda key, value: {"firstMatch": [{key: value}]}])
-@pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))
-def test_valid(new_session, body, key, value):
- resp = new_session({"capabilities": body(key, value)})
-
-# Continued in create-1.py to avoid timeouts
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py
@@ -0,0 +1,13 @@
+#META: timeout=long
+
+import pytest
+
+from conftest import product, flatten
+
+from .support.create import valid_data
+
+
+@pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))
+def test_valid(new_session, key, value):
+ resp = new_session({"capabilities": {"alwaysMatch": {key: value}}})
+
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/tests/sessions/new_session/create_firstMatch.py
@@ -0,0 +1,12 @@
+#META: timeout=long
+
+import pytest
+
+from conftest import product, flatten
+
+from .support.create import valid_data
+
+
+@pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))
+def test_valid(new_session, key, value):
+ resp = new_session({"capabilities": {"firstMatch": [{key: value}]}})
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/tests/sessions/new_session/support/create.py
@@ -0,0 +1,11 @@
+# Note that we can only test things here all implementations must support
+valid_data = [
+ ("acceptInsecureCerts", [False, None]),
+ ("browserName", [None]),
+ ("browserVersion", [None]),
+ ("platformName", [None]),
+ ("pageLoadStrategy", ["none", "eager", "normal", None]),
+ ("proxy", [None]),
+ ("unhandledPromptBehavior", ["dismiss", "accept", None]),
+ ("test:extension", [True, "abc", 123, [], {"key": "value"}, None]),
+]