From bea24f7bbae37c27e3d2f4b929153df5dbf56e5f Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 31 May 2017 09:07:00 +0100 Subject: [PATCH] Bug 1367040 - Fixup some bogus wpt metadata, a=testonly Some cross-platform failures were missing metadata for macOS. MozReview-Commit-ID: 23Bg4yhhSOi --- .../the-window-object/historical.window.js.ini | 11 +---------- .../fetch-response-taint.https.html.ini | 9 +-------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/testing/web-platform/meta/html/browsers/the-window-object/historical.window.js.ini b/testing/web-platform/meta/html/browsers/the-window-object/historical.window.js.ini index 0c0a3f38f3c2..c87bb7ccdee9 100644 --- a/testing/web-platform/meta/html/browsers/the-window-object/historical.window.js.ini +++ b/testing/web-platform/meta/html/browsers/the-window-object/historical.window.js.ini @@ -1,13 +1,4 @@ [historical.window.html] type: testharness [showModalDialog() has been removed from the platform] - expected: - if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL - if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL - if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL - if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL - if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL - if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL - if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL - if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL - + expected: FAIL \ No newline at end of file diff --git a/testing/web-platform/meta/service-workers/service-worker/fetch-response-taint.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/fetch-response-taint.https.html.ini index 257d3cf16d0d..deb55d20259d 100644 --- a/testing/web-platform/meta/service-workers/service-worker/fetch-response-taint.https.html.ini +++ b/testing/web-platform/meta/service-workers/service-worker/fetch-response-taint.https.html.ini @@ -2,14 +2,7 @@ type: testharness [fetching url:"https://www1.web-platform.test:8443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=https://web-platform.test:8443&ACACredentials=true" mode:"cors" credentials:"include" should succeed.] expected: - if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL - if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL - if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL - if not debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL - if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL - if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL - if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL - if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL + expected: FAIL [fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"omit" should succeed.] expected: FAIL