diff --git a/testing/web-platform/meta/fetch/local-network-access/iframe.tentative.https.window.js.ini b/testing/web-platform/meta/fetch/local-network-access/iframe.tentative.https.window.js.ini index 54c842053a3b0..5c4cb97d4e2f2 100644 --- a/testing/web-platform/meta/fetch/local-network-access/iframe.tentative.https.window.js.ini +++ b/testing/web-platform/meta/fetch/local-network-access/iframe.tentative.https.window.js.ini @@ -1,17 +1,6 @@ [iframe.tentative.https.window.html] expected: - if os == "win": OK - if os == "android": OK - TIMEOUT - [local to local: no preflight required.] - expected: - if (os == "android") and debug and not swgl: [FAIL, PASS] - if (os == "android") and debug and swgl: [FAIL, PASS] - - [local to private: no preflight required.] - expected: - if (os == "win") and not debug and (processor == "x86_64"): [PASS, FAIL] - + if os == "linux": TIMEOUT [private to local: failed preflight.] expected: FAIL @@ -46,12 +35,10 @@ [public to local, grandparent navigates: failure.] expected: - if os == "android": FAIL - if os == "win": FAIL - TIMEOUT + if os == "linux": TIMEOUT + FAIL [public to local, grandparent navigates: success.] expected: - if os == "android": FAIL - if os == "win": FAIL - TIMEOUT + if os == "linux": TIMEOUT + FAIL diff --git a/testing/web-platform/meta/fetch/local-network-access/mixed-content-fetch.tentative.https.window.js.ini b/testing/web-platform/meta/fetch/local-network-access/mixed-content-fetch.tentative.https.window.js.ini index cd154e1f0b0bf..40bbd87094c99 100644 --- a/testing/web-platform/meta/fetch/local-network-access/mixed-content-fetch.tentative.https.window.js.ini +++ b/testing/web-platform/meta/fetch/local-network-access/mixed-content-fetch.tentative.https.window.js.ini @@ -2,155 +2,155 @@ [https-local to http-local: wrong targetAddressSpace "unknown".] expected: FAIL - [https-local to http-local: wrong targetAddressSpace "public".] + [https-local to http-local: wrong targetAddressSpace "private".] expected: FAIL - [https-local to http-public: wrong targetAddressSpace "unknown".] + [https-local to http-local: wrong targetAddressSpace "public".] expected: FAIL - [https-local to http-public: wrong targetAddressSpace "local".] + [https-local to http-local: not a private network request.] expected: FAIL - [https-public to http-local: missing targetAddressSpace.] + [https-local to http-private: wrong targetAddressSpace "unknown".] expected: FAIL - [https-public to http-local: wrong targetAddressSpace "unknown".] + [https-local to http-private: wrong targetAddressSpace "local".] expected: FAIL - [https-public to http-local: wrong targetAddressSpace "public".] + [https-local to http-private: wrong targetAddressSpace "public".] expected: FAIL - [https-public to http-local: failed preflight.] + [https-local to http-private: not a private network request.] expected: FAIL - [https-public to http-local: success.] + [https-local to http-public: wrong targetAddressSpace "unknown".] expected: FAIL - [https-public to http-local: PUT success.] + [https-local to http-public: wrong targetAddressSpace "local".] expected: FAIL - [https-public to http-local: no-cors success.] + [https-local to http-public: wrong targetAddressSpace "private".] expected: FAIL - [https-public to http-public: wrong targetAddressSpace "unknown".] + [https-local to http-public: not a private network request.] expected: FAIL - [https-public to http-public: wrong targetAddressSpace "local".] + [https-private to http-local: missing targetAddressSpace.] expected: FAIL - [https-treat-as-public to http-local: success.] + [https-private to http-local: wrong targetAddressSpace "unknown".] expected: FAIL - [https-public to http-loopback: missing targetAddressSpace.] + [https-private to http-local: wrong targetAddressSpace "private".] expected: FAIL - [https-local to http-loopback: no-cors success.] + [https-private to http-local: wrong targetAddressSpace "public".] expected: FAIL - [https-local to http-loopback: success.] + [https-private to http-local: failed preflight.] expected: FAIL - [https-public to http-loopback: no-cors success.] + [https-private to http-local: success.] expected: FAIL - [https-local to http-loopback: missing targetAddressSpace.] + [https-private to http-local: PUT success.] expected: FAIL - [https-local to http-loopback: failed preflight.] + [https-private to http-local: no-cors success.] expected: FAIL - [https-public to http-loopback: PUT success.] + [https-private to http-private: wrong targetAddressSpace "unknown".] expected: FAIL - [https-public to http-loopback: wrong targetAddressSpace "unknown".] + [https-private to http-private: wrong targetAddressSpace "local".] expected: FAIL - [https-public to http-loopback: success.] + [https-private to http-private: wrong targetAddressSpace "public".] expected: FAIL - [https-loopback to http-public: wrong targetAddressSpace "local".] + [https-private to http-private: not a private network request.] expected: FAIL - [https-public to http-public: wrong targetAddressSpace "loopback".] + [https-private to http-public: wrong targetAddressSpace "unknown".] expected: FAIL - [https-loopback to http-local: wrong targetAddressSpace "public".] + [https-private to http-public: wrong targetAddressSpace "local".] expected: FAIL - [https-local to http-loopback: wrong targetAddressSpace "unknown".] + [https-private to http-public: wrong targetAddressSpace "private".] expected: FAIL - [https-public to http-public: not a local network request.] + [https-private to http-public: not a private network request.] expected: FAIL - [https-loopback to http-loopback: wrong targetAddressSpace "local".] + [https-public to http-local: missing targetAddressSpace.] expected: FAIL - [https-public to http-loopback: wrong targetAddressSpace "public".] + [https-public to http-local: wrong targetAddressSpace "unknown".] expected: FAIL - [https-loopback to http-public: wrong targetAddressSpace "unknown".] + [https-public to http-local: wrong targetAddressSpace "private".] expected: FAIL - [https-public to http-local: wrong targetAddressSpace "loopback".] + [https-public to http-local: wrong targetAddressSpace "public".] expected: FAIL - [https-treat-as-public to http-loopback: success.] + [https-public to http-local: failed preflight.] expected: FAIL - [https-local to http-public: wrong targetAddressSpace "loopback".] + [https-public to http-local: success.] expected: FAIL - [https-local to http-loopback: wrong targetAddressSpace "local".] + [https-public to http-local: PUT success.] expected: FAIL - [https-loopback to http-loopback: wrong targetAddressSpace "public".] + [https-public to http-local: no-cors success.] expected: FAIL - [https-local to http-loopback: wrong targetAddressSpace "public".] + [https-public to http-private: missing targetAddressSpace.] expected: FAIL - [https-local to http-loopback: PUT success.] + [https-public to http-private: wrong targetAddressSpace "unknown".] expected: FAIL - [https-loopback to http-loopback: not a local network request.] + [https-public to http-private: wrong targetAddressSpace "local".] expected: FAIL - [https-local to http-local: not a local network request.] + [https-public to http-private: wrong targetAddressSpace "public".] expected: FAIL - [https-loopback to http-loopback: wrong targetAddressSpace "unknown".] + [https-public to http-private: failed preflight.] expected: FAIL - [https-treat-as-public to http-loopback: wrong targetAddressSpace "local".] + [https-public to http-private: success.] expected: FAIL - [https-loopback to http-local: wrong targetAddressSpace "loopback".] + [https-public to http-private: PUT success.] expected: FAIL - [https-loopback to http-public: wrong targetAddressSpace "loopback".] + [https-public to http-private: no-cors success.] expected: FAIL - [https-local to http-local: wrong targetAddressSpace "loopback".] + [https-public to http-public: wrong targetAddressSpace "unknown".] expected: FAIL - [https-local to http-public: not a local network request.] + [https-public to http-public: wrong targetAddressSpace "local".] expected: FAIL - [https-treat-as-public to http-local: wrong targetAddressSpace "loopback".] + [https-public to http-public: wrong targetAddressSpace "private".] expected: FAIL - [https-public to http-loopback: failed preflight.] + [https-public to http-public: not a private network request.] expected: FAIL - [https-loopback to http-local: wrong targetAddressSpace "unknown".] + [https-treat-as-public to http-local: wrong targetAddressSpace "private".] expected: FAIL - [https-public to http-loopback: wrong targetAddressSpace "local".] + [https-treat-as-public to http-local: success.] expected: FAIL - [https-loopback to http-local: not a local network request.] + [https-treat-as-public to http-private: wrong targetAddressSpace "local".] expected: FAIL - [https-loopback to http-public: not a local network request.] + [https-treat-as-public to http-private: success.] expected: FAIL diff --git a/testing/web-platform/meta/fetch/local-network-access/service-worker-background-fetch.https.window.js.ini b/testing/web-platform/meta/fetch/local-network-access/service-worker-background-fetch.https.window.js.ini index 12b949bc39d3c..6264b88615eda 100644 --- a/testing/web-platform/meta/fetch/local-network-access/service-worker-background-fetch.https.window.js.ini +++ b/testing/web-platform/meta/fetch/local-network-access/service-worker-background-fetch.https.window.js.ini @@ -1,7 +1,4 @@ [service-worker-background-fetch.https.window.html] - expected: - if swgl and (os == "linux") and not fission: [OK, TIMEOUT] - if swgl and (os == "android"): [OK, TIMEOUT] [local to local: success.] expected: FAIL @@ -9,41 +6,22 @@ expected: FAIL [private to private: success.] - expected: - if swgl and (os == "linux") and not fission: [FAIL, TIMEOUT] - FAIL + expected: FAIL [public to local: success.] - expected: - if swgl and (os == "linux") and not fission: [FAIL, NOTRUN] - FAIL + expected: FAIL [public to private: success.] - expected: - if swgl and (os == "linux") and not fission: [FAIL, NOTRUN] - if swgl and (os == "android"): [FAIL, TIMEOUT] - FAIL + expected: FAIL [public to public: success.] - expected: - if swgl and (os == "linux") and not fission: [FAIL, NOTRUN] - if swgl and (os == "android"): [FAIL, NOTRUN] - FAIL + expected: FAIL [treat-as-public to local: success.] - expected: - if swgl and (os == "linux") and not fission: [FAIL, NOTRUN] - if swgl and (os == "android"): [FAIL, NOTRUN] - FAIL + expected: FAIL [treat-as-public to private: success.] - expected: - if swgl and (os == "linux") and not fission: [FAIL, NOTRUN] - if swgl and (os == "android"): [FAIL, NOTRUN] - FAIL + expected: FAIL [treat-as-public to public: success.] - expected: - if swgl and (os == "linux") and not fission: [FAIL, NOTRUN] - if swgl and (os == "android"): [FAIL, NOTRUN] - FAIL + expected: FAIL diff --git a/testing/web-platform/meta/fetch/local-network-access/service-worker-fetch.https.window.js.ini b/testing/web-platform/meta/fetch/local-network-access/service-worker-fetch.https.window.js.ini index 34779891064aa..2640f2e3e8763 100644 --- a/testing/web-platform/meta/fetch/local-network-access/service-worker-fetch.https.window.js.ini +++ b/testing/web-platform/meta/fetch/local-network-access/service-worker-fetch.https.window.js.ini @@ -1,3 +1,4 @@ + [service-worker-fetch.https.window.html] expected: if swgl and (os == "linux") and not fission: [TIMEOUT, OK] @@ -66,3 +67,35 @@ expected: if swgl and (os == "linux") and not fission: [NOTRUN, PASS] NOTRUN + +[service-worker-fetch.https.window.html] + [private to local: failed preflight.] + expected: FAIL + + [private to local: success.] + expected: FAIL + + [public to local: failed preflight.] + expected: FAIL + + [public to local: success.] + expected: FAIL + + [public to private: failed preflight.] + expected: FAIL + + [public to private: success.] + expected: FAIL + + [treat-as-public to local: failed preflight.] + expected: FAIL + + [treat-as-public to local: success.] + expected: FAIL + + [treat-as-public to private: failed preflight.] + expected: FAIL + + [treat-as-public to private: success.] + expected: FAIL + diff --git a/testing/web-platform/meta/fetch/local-network-access/service-worker-update.https.window.js.ini b/testing/web-platform/meta/fetch/local-network-access/service-worker-update.https.window.js.ini index e38f2809acdea..10b5ad1364154 100644 --- a/testing/web-platform/meta/fetch/local-network-access/service-worker-update.https.window.js.ini +++ b/testing/web-platform/meta/fetch/local-network-access/service-worker-update.https.window.js.ini @@ -12,9 +12,4 @@ expected: FAIL [update public to public: success.] - expected: - if (os == "win") and debug and (processor == "x86_64") and swgl: [PASS, FAIL] - if (os == "win") and debug and (processor == "x86"): [PASS, FAIL] - if (os == "android") and not swgl and not debug: [PASS, FAIL] - if (os == "android") and not swgl and debug: [PASS, FAIL] - if (os == "linux") and swgl and not fission: [PASS, FAIL] + expected: [PASS, FAIL]