Bug 1478401 [wpt PR 11990] - Adding custom pytest marker registration to WebDriver tests, a=testonly
authorjimevans <james.h.evans.jr@gmail.com>
Wed, 25 Jul 2018 15:47:07 +0000
changeset 428925 dad54c3428fb04c827370ea95c7da45b087704c9
parent 428924 c5474272f8eefbf4a7f6fc7310270e09eaad0280
child 428926 f8599bc2334c4d64f62b458e5a30aca89e44b122
push id105805
push userjames@hoppipolla.co.uk
push dateSun, 29 Jul 2018 18:28:58 +0000
treeherdermozilla-inbound@7ca03e42cbdf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1478401, 11990
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1478401 [wpt PR 11990] - Adding custom pytest marker registration to WebDriver tests, a=testonly Automatic update from web-platform-testsAdding custom pytest marker registration to WebDriver tests (#11990) The WebDriver tests can now use a custom pytest marker to specify the capabilities for a session in a specific test. The marker must be registered with the system to be valid, however. -- wpt-commits: af3df7d99f7f77daa69dd11f19969b48c2c34e46 wpt-pr: 11990
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/webdriver/tests/conftest.py
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -624295,17 +624295,17 @@
    "8c22860607cb0f3d610888c9816bf2384e2c5445",
    "wdspec"
   ],
   "webdriver/tests/close_window/user_prompts.py": [
    "9610df8253e631023b51a06f6c7629e200375679",
    "wdspec"
   ],
   "webdriver/tests/conftest.py": [
-   "ab3d9928bc95453d1a624b894333ed7582a538e2",
+   "0621a8ea4a5c12b3f510c82457d51a81d947f9a3",
    "support"
   ],
   "webdriver/tests/delete_all_cookies/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/delete_all_cookies/delete.py": [
    "1248b2e14b6b690b996f8bf620a6a1f33514256a",
--- a/testing/web-platform/tests/webdriver/tests/conftest.py
+++ b/testing/web-platform/tests/webdriver/tests/conftest.py
@@ -7,16 +7,21 @@ from tests.support.fixtures import (
     create_frame,
     create_window,
     current_session,
     http,
     server_config,
     session,
     url)
 
+def pytest_configure(config):
+    # register the capabilities marker
+    config.addinivalue_line("markers",
+        "capabilities: mark test to use capabilities")
+
 
 @pytest.fixture
 def capabilities():
     """Default capabilities to use for a new WebDriver session."""
     return {}
 
 
 def pytest_generate_tests(metafunc):