diff options
Diffstat (limited to 'testing/web-platform/meta/mixed-content')
10 files changed, 33 insertions, 38 deletions
diff --git a/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.ini b/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.ini new file mode 100644 index 0000000000..d313086060 --- /dev/null +++ b/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.ini @@ -0,0 +1,3 @@ +[audio-tag.https.html] + expected: + if (os == "android") and not debug: [OK, ERROR] diff --git a/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html.ini b/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html.ini index 0d915d4c09..c6e3b0f937 100644 --- a/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html.ini +++ b/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html.ini @@ -1,3 +1,3 @@ [video-tag.https.html] expected: - if (os == "android") and fission: [OK, TIMEOUT] + if (os == "android") and not debug: [OK, ERROR] diff --git a/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/audio-tag.https.html.ini b/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/audio-tag.https.html.ini new file mode 100644 index 0000000000..d313086060 --- /dev/null +++ b/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/audio-tag.https.html.ini @@ -0,0 +1,3 @@ +[audio-tag.https.html] + expected: + if (os == "android") and not debug: [OK, ERROR] diff --git a/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/video-tag.https.html.ini b/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/video-tag.https.html.ini index a2fc60b373..c6e3b0f937 100644 --- a/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/video-tag.https.html.ini +++ b/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/video-tag.https.html.ini @@ -1,3 +1,3 @@ [video-tag.https.html] expected: - if (os == "android") and fission: [TIMEOUT, OK] + if (os == "android") and not debug: [OK, ERROR] diff --git a/testing/web-platform/meta/mixed-content/gen/top.meta/unset/audio-tag.https.html.ini b/testing/web-platform/meta/mixed-content/gen/top.meta/unset/audio-tag.https.html.ini index 873fc51402..3c9fb2a0d1 100644 --- a/testing/web-platform/meta/mixed-content/gen/top.meta/unset/audio-tag.https.html.ini +++ b/testing/web-platform/meta/mixed-content/gen/top.meta/unset/audio-tag.https.html.ini @@ -1,4 +1,4 @@ prefs: [security.mixed_content.upgrade_display_content:false] [audio-tag.https.html] expected: - if (os == "android") and fission: [OK, TIMEOUT] + if (os == "android") and not debug: [OK, ERROR] diff --git a/testing/web-platform/meta/mixed-content/gen/top.meta/unset/video-tag.https.html.ini b/testing/web-platform/meta/mixed-content/gen/top.meta/unset/video-tag.https.html.ini index 15aa91913f..a8c8754c33 100644 --- a/testing/web-platform/meta/mixed-content/gen/top.meta/unset/video-tag.https.html.ini +++ b/testing/web-platform/meta/mixed-content/gen/top.meta/unset/video-tag.https.html.ini @@ -3,17 +3,16 @@ prefs: [security.mixed_content.upgrade_display_content:false] expected: if (os == "win") and not debug: [OK, TIMEOUT] if (os == "mac") and debug: [OK, TIMEOUT] - if (os == "mac") and not debug: [OK, TIMEOUT] - if (os == "linux") and (processor == "x86"): [OK, TIMEOUT] + if (os == "mac") and not debug: [TIMEOUT, OK] + if (os == "android") and not debug: [OK, ERROR] [Mixed-Content: Expects allowed for video-tag to same-https origin and keep-scheme redirection from https context.] expected: if (os == "win") and not debug: [PASS, TIMEOUT] if (os == "mac") and debug: [PASS, TIMEOUT] - if (os == "mac") and not debug: [PASS, TIMEOUT] - if (os == "linux") and (processor == "x86"): [PASS, TIMEOUT] + if (os == "mac") and not debug: [TIMEOUT, PASS] + [Mixed-Content: Expects allowed for video-tag to same-https origin and no-redirect redirection from https context.] expected: if (os == "win") and not debug: [PASS, NOTRUN] if (os == "mac") and debug: [PASS, NOTRUN] - if (os == "mac") and not debug: [PASS, NOTRUN] - if (os == "linux") and (processor == "x86"): [NOTRUN, PASS, TIMEOUT] + if (os == "mac") and not debug: [NOTRUN, PASS] diff --git a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini index ce286d5bd9..0d87bdc5bd 100644 --- a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini +++ b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini @@ -2,21 +2,21 @@ disabled: if (os == "android") and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1401570 expected: - if (os == "linux") and asan and not fission: [TIMEOUT, OK] + if (os == "linux") and (processor == "x86_64") and debug and fission: [TIMEOUT, OK] + if (os == "linux") and (processor == "x86"): [TIMEOUT, OK] if os == "mac": OK if os == "android": [OK, ERROR, TIMEOUT] [OK, TIMEOUT] [Audio autoupgraded] expected: - if (os == "linux") and fission and not debug and (processor == "x86_64") and not asan and not tsan: [PASS, TIMEOUT] - if (os == "linux") and not fission: [PASS, TIMEOUT] - if os == "win": [PASS, TIMEOUT] - if os == "android": [PASS, TIMEOUT] + if (os == "linux") and (processor == "x86_64") and fission and not debug and tsan: PASS + if (os == "linux") and (processor == "x86_64") and fission and debug: PASS + if (os == "linux") and (processor == "x86"): TIMEOUT + if os == "mac": PASS + [PASS, TIMEOUT] [Audio of other host autoupgraded] expected: - if (os == "linux") and asan and not fission: [TIMEOUT, PASS] - if (os == "win") and not swgl: PASS - if os == "mac": PASS - if os == "android": PASS - [PASS, TIMEOUT] + if (os == "linux") and debug and fission: [TIMEOUT, PASS] + if (os == "linux") and debug and not fission: [PASS, TIMEOUT] + if (os == "linux") and not debug: [PASS, TIMEOUT] diff --git a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini index c87e42f6f6..6abe67fde9 100644 --- a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini +++ b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini @@ -1,4 +1,4 @@ [image-upgrade.https.sub.html] expected: - if (os == "android") and debug and swgl: [OK, ERROR] - if (os == "android") and debug and not swgl: [OK, ERROR] + if (os == "android") and debug: [OK, ERROR] + if (os == "android") and not debug: [OK, CRASH] diff --git a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini index 7133fe01c5..8748b3fc92 100644 --- a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini +++ b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini @@ -1,19 +1,14 @@ [mixed-content-cors.https.sub.html] expected: - if (os == "linux") and (processor == "x86_64") and not tsan and debug and swgl: [OK, TIMEOUT] - if (os == "linux") and (processor == "x86_64") and not tsan and not debug: [OK, TIMEOUT] - if (os == "linux") and (processor == "x86_64") and tsan: TIMEOUT - if (os == "linux") and (processor == "x86"): [TIMEOUT, OK] - if (os == "android") and not debug: [OK, TIMEOUT] + if (os == "linux") and debug: [OK, TIMEOUT] + if (os == "linux") and not debug: [OK, TIMEOUT] + if (os == "android") and not debug: [OK, ERROR, TIMEOUT] [Cross-Origin audio should get upgraded even if CORS is set] expected: - if (os == "linux") and (processor == "x86_64") and not tsan and debug and swgl: [PASS, TIMEOUT] - if (os == "linux") and (processor == "x86_64") and not tsan and not debug: [PASS, TIMEOUT] - if (os == "linux") and (processor == "x86_64") and tsan: TIMEOUT - if (os == "linux") and (processor == "x86"): [TIMEOUT, PASS] + if (os == "linux") and debug: [PASS, TIMEOUT] + if (os == "linux") and not debug: [PASS, TIMEOUT] if (os == "android") and not debug: [PASS, TIMEOUT] [Cross-Origin video should get upgraded even if CORS is set] expected: - if (os == "linux") and swgl and fission: [PASS, TIMEOUT] if (os == "android") and not debug: [PASS, TIMEOUT] diff --git a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini index 35506023bb..a42e327322 100644 --- a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini +++ b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini @@ -1,9 +1,4 @@ [video-upgrade.https.sub.html] expected: - if (os == "linux") and fission and swgl: [OK, TIMEOUT] - if (os == "linux") and not fission and not debug: [OK, TIMEOUT] - if (os == "android") and debug and not swgl: [OK, ERROR] - [Video autoupgraded] - expected: - if fission and swgl and (os == "linux"): [PASS, TIMEOUT] - if not fission and (os == "linux") and not debug: [PASS, TIMEOUT] + if (os == "android") and debug: [OK, ERROR] + if (os == "android") and not debug: [OK, ERROR] |