Bug 1481911 [wpt PR 12360] - [wptrunner] Make test skipping explicit, a=testonly
authorMike Pennisi <mike@mikepennisi.com>
Thu, 16 Aug 2018 09:43:02 +0000
changeset 432009 811e84ef1cd54fa33dce6ee9645154635be52b43
parent 432008 ec6576577039d634b336ce407ea23d8c5b00cc03
child 432010 1247a5702eab966d4c434f2d784641c5617ff0a6
push id34456
push usertoros@mozilla.com
push dateThu, 16 Aug 2018 21:33:21 +0000
treeherdermozilla-central@72442cf86f54 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1481911, 12360
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 1481911 [wpt PR 12360] - [wptrunner] Make test skipping explicit, a=testonly Automatic update from web-platform-tests[wptrunner] Make test skipping explicit Explicitly report on skipped "jsshell" tests during execution. This gives users an indication that the behavior is intentional and promotes parity with the output generated by the `--list-tests` flag of the `wpt run. command. -- fixup! [wptrunner] Make test skipping explicit -- wpt-commits: 7216e51e5adc60147487e5226632696aadb9f677, 68ad8b6ff5226972ee9c5418f931e6b4e03eeac3 wpt-pr: 12360
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -642164,17 +642164,17 @@
    "f63869636da79cdcdc961e137d4f044055d74de4",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptmanifest/tests/test_tokenizer.py": [
    "a64ce0c7bb7d8d089a8cb1365c0477a08652eacc",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptrunner.py": [
-   "1ee4d54c71ebfe8d65fe9a99fe1e3055711a6049",
+   "aab5996afd94e78686a027fd8546ca83e77766f4",
    "support"
   ],
   "tools/wptrunner/wptrunner/wpttest.py": [
    "c29ba974a99786f687f2aead1ba14045c12fb643",
    "support"
   ],
   "tools/wptserve/.gitignore": [
    "8e87d388488bbc21c664209fecd2f3e030411b0e",
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -233,25 +233,20 @@ def run_tests(config, test_paths, produc
 
                     for test in test_loader.disabled_tests[test_type]:
                         logger.test_start(test.id)
                         logger.test_end(test.id, status="SKIP")
 
                     if test_type == "testharness":
                         run_tests = {"testharness": []}
                         for test in test_loader.tests["testharness"]:
-                            if test.testdriver and not executor_cls.supports_testdriver:
+                            if (test.testdriver and not executor_cls.supports_testdriver) or (
+                                    test.jsshell and not executor_cls.supports_jsshell):
                                 logger.test_start(test.id)
                                 logger.test_end(test.id, status="SKIP")
-                            elif test.jsshell and not executor_cls.supports_jsshell:
-                                # We expect that tests for JavaScript shells
-                                # will not be run along with tests that run in
-                                # a full web browser, so we silently skip them
-                                # here.
-                                pass
                             else:
                                 run_tests["testharness"].append(test)
                     else:
                         run_tests = test_loader.tests
 
                     with ManagerGroup("web-platform-tests",
                                       kwargs["processes"],
                                       test_source_cls,