Bug 1123506 - Update expectations for certain CSP tests draft
authorAndreas Tolfsen <ato@mozilla.com>
Tue, 12 Apr 2016 16:44:16 +0100
changeset 350351 9020015d428a479f58439970ebefb29778b591b0
parent 350336 02e9675c2ca9702d44417e9718d4a1a8b0659648
child 518308 08f26fb4f2b8f10003f3bfc8e060b6e4bccf02fd
push id15314
push userbmo:ato@mozilla.com
push dateWed, 13 Apr 2016 11:54:52 +0000
bugs1123506
milestone48.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