Bug 1123506 - Update expectations for certain CSP tests draft
authorAndreas Tolfsen <ato@mozilla.com>
Tue, 12 Apr 2016 16:44:16 +0100
changeset 749214 37625e16f5e61e999e257f46984d67a524d3592a
parent 749213 a97d9136a00235a73f1ba9ac8548f6f80cbec06d
child 749215 44699d1978bd35db7fc06b964212531c79a3dd2f
child 749253 6157729a9dccc278782f5fc3ea07c28778be88f7
push id121667
push useratolfsen@mozilla.com
push dateWed, 27 Apr 2016 12:44:15 +0000
treeherdertry@44699d1978bd [default view] [failures only]
bugs1123506
milestone49.0a1
Bug 1123506 - Update expectations for certain CSP tests We assume the CSP tests were incorrectly passing earlier and that they are now failing as expected. MozReview-Commit-ID: 8bVV1seTnLS
testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: picture-tag\n                                 expectation: blocked]
+    expected:
+      if (os == "mac"): FAIL
+      if (os == "linux"): FAIL
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: picture-tag\n                                 expectation: blocked]
+    expected:
+      if (os == "linux"): FAIL
+      if (os == "mac"): FAIL
--- a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -1,10 +1,9 @@
 [no-opt-in-blocks.https.html]
   type: testharness
   disabled:
     if e10s and (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1184351
     if e10s and (os == "mac"): https://bugzilla.mozilla.org/show_bug.cgi?id=1184351
   [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: picture-tag\n                                 expectation: blocked]
     expected:
-      if debug and (os == "linux"): FAIL
-      if debug and (os == "mac"): FAIL
-
+      if (os == "linux"): FAIL
+      if (os == "mac"): FAIL
--- a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -1,10 +1,10 @@
 [no-opt-in-blocks.https.html]
   type: testharness
   disabled:
     if debug and (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1184351
     if e10s and (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1184351
     if e10s and (os == "mac"): https://bugzilla.mozilla.org/show_bug.cgi?id=1184351
   [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: picture-tag\n                                 expectation: blocked]
     expected:
-      if debug and (os == "mac"): FAIL
-
+      if (os == "linux"): FAIL
+      if (os == "mac"): FAIL