diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /testing/web-platform/meta/mixed-content/gen | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/web-platform/meta/mixed-content/gen')
6 files changed, 14 insertions, 9 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] |