Bug 1418243 - Enable web-platform tests which expected FAIL because of violatedDirective. r=ckerschb
☠☠ backed out by 9fcef08d7bfb ☠ ☠
authorChung-Sheng Fu <cfu@mozilla.com>
Mon, 15 Jan 2018 23:30:00 +0200
changeset 399402 5357dbb6df2b38e24d52c803ca0909adf6bc6f9a
parent 399401 778a37000696143dcf3e21d6ba822de35a4b26e9
child 399403 090420884002e7e88f0f929290a21144dcc81536
push id98944
push userapavel@mozilla.com
push dateTue, 16 Jan 2018 10:08:42 +0000
treeherdermozilla-inbound@5357dbb6df2b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersckerschb
bugs1418243
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1418243 - Enable web-platform tests which expected FAIL because of violatedDirective. r=ckerschb MozReview-Commit-ID: LkCwVWs2rSr
testing/web-platform/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini
testing/web-platform/meta/content-security-policy/blob/blob-urls-do-not-match-self.sub.html.ini
testing/web-platform/meta/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/connect-src/worker-from-guid.sub.html.ini
testing/web-platform/meta/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/form-action/form-action-src-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/form-action/form-action-src-get-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/generic/generic-0_10_1.sub.html.ini
testing/web-platform/meta/content-security-policy/generic/generic-0_2_2.sub.html.ini
testing/web-platform/meta/content-security-policy/generic/generic-0_2_3.html.ini
testing/web-platform/meta/content-security-policy/generic/generic-0_8_1.sub.html.ini
testing/web-platform/meta/content-security-policy/img-src/report-blocked-data-uri.sub.html.ini
testing/web-platform/meta/content-security-policy/object-src/object-src-url-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html.ini
testing/web-platform/meta/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html.ini
testing/web-platform/meta/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html.ini
testing/web-platform/meta/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html.ini
testing/web-platform/meta/content-security-policy/script-src/injected-inline-script-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-1_1.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-1_2.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-1_2_1.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-1_4.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-1_4_1.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-1_4_2.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_discard_whitelist.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html.ini
testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.ini
testing/web-platform/meta/content-security-policy/script-src/scripthash-unicode-normalization.sub.html.ini
testing/web-platform/meta/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html.ini
testing/web-platform/meta/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html.ini
testing/web-platform/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html.ini
testing/web-platform/meta/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.ini
testing/web-platform/meta/content-security-policy/style-src/injected-inline-style-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html.ini
testing/web-platform/meta/content-security-policy/style-src/inline-style-attribute-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-hash-blocked.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-imported-style-blocked.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-injected-inline-style-blocked.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-injected-stylesheet-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-attribute-blocked.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-blocked.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-nonce-blocked.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-none-blocked.html.ini
testing/web-platform/meta/content-security-policy/style-src/style-src-stylesheet-nonce-blocked.html.ini
testing/web-platform/meta/content-security-policy/style-src/stylehash-basic-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/style-src/stylenonce-allowed.sub.html.ini
testing/web-platform/meta/content-security-policy/style-src/stylenonce-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/svg/object-in-svg-foreignobject.sub.html.ini
testing/web-platform/meta/content-security-policy/svg/svg-inline.sub.html.ini
testing/web-platform/meta/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html.ini
testing/web-platform/meta/content-security-policy/unsafe-eval/eval-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html.ini
testing/web-platform/meta/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html.ini
--- a/testing/web-platform/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini
@@ -1,5 +1,3 @@
 [report-uri-does-not-respect-base-uri.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Event is fired]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/blob/blob-urls-do-not-match-self.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/blob/blob-urls-do-not-match-self.sub.html.ini
@@ -1,4 +1,3 @@
 [blob-urls-do-not-match-self.sub.html]
-  [Expecting logs: ["violated-directive=script-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html.ini
@@ -1,10 +1,9 @@
 [connect-src-beacon-blocked.sub.html]
+  type: testharness
+  prefs: [security.csp.enable_violation_events:true]
   [sendBeacon should not throw.]
     expected: FAIL
 
   [redirect case]
     expected: TIMEOUT
 
-  [Expecting logs: ["Pass", "violated-directive=connect-src"\]]
-    expected: FAIL
-
--- a/testing/web-platform/meta/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [connect-src-beacon-redirect-to-blocked.sub.html]
-  [Expecting logs: ["violated-directive=connect-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html.ini
@@ -1,4 +1,4 @@
 [connect-src-eventsource-blocked.sub.html]
-  [Expecting logs: ["Pass","violated-directive=connect-src"\]]
-    expected: FAIL
+  type: testharness
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html.ini
@@ -1,7 +1,6 @@
 [connect-src-eventsource-redirect-to-blocked.sub.html]
+  type: testharness
+  prefs: [security.csp.enable_violation_events:true]
   [Expecting logs: ["PASS EventSource() did not follow the disallowed redirect.","PASS successfullyParsed is true","TEST COMPLETE"\]]
     expected: FAIL
 
-  [Expecting logs: ["PASS EventSource() did not follow the disallowed redirect.","TEST COMPLETE", "violated-directive=connect-src"\]]
-    expected: FAIL
-
--- a/testing/web-platform/meta/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html.ini
@@ -1,7 +1,6 @@
 [connect-src-websocket-blocked.sub.html]
+  type: testharness
+  prefs: [security.csp.enable_violation_events:true]
   [WebSocket should fire error event.]
     expected: FAIL
 
-  [Expecting logs: ["Pass","violated-directive=connect-src"\]]
-    expected: FAIL
-
--- a/testing/web-platform/meta/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html.ini
@@ -1,11 +1,8 @@
 [connect-src-xmlhttprequest-blocked.sub.html]
   prefs: [security.csp.enable_violation_events:true]
   [XHR should fire onerror.]
     expected: TIMEOUT
 
   [XHR should fire onerror after a redirect.]
     expected: FAIL
 
-  [Expecting logs: ["Pass","violated-directive=connect-src"\]]
-    expected: FAIL
-
--- a/testing/web-platform/meta/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [connect-src-xmlhttprequest-redirect-to-blocked.sub.html]
-  [Expecting logs: ["PASS XMLHttpRequest.send() did not follow the disallowed redirect.","TEST COMPLETE","violated-directive=connect-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/connect-src/worker-from-guid.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/connect-src/worker-from-guid.sub.html.ini
@@ -1,4 +1,3 @@
 [worker-from-guid.sub.html]
-  [Expecting logs: ["violated-directive=connect-src","xhr blocked","TEST COMPLETE"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html.ini
@@ -1,5 +1,3 @@
 [font-stylesheet-font-blocked.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Test font does not load if it does not match font-src.]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/form-action/form-action-src-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/form-action/form-action-src-blocked.sub.html.ini
@@ -1,7 +1,6 @@
 [form-action-src-blocked.sub.html]
+  type: testharness
+  prefs: [security.csp.enable_violation_events:true]
   [form-action-src-blocked]
     expected: FAIL
 
-  [Expecting logs: ["violated-directive=form-action","TEST COMPLETE"\]]
-    expected: FAIL
-
--- a/testing/web-platform/meta/content-security-policy/form-action/form-action-src-get-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/form-action/form-action-src-get-blocked.sub.html.ini
@@ -1,7 +1,6 @@
 [form-action-src-get-blocked.sub.html]
+  type: testharness
+  prefs: [security.csp.enable_violation_events:true]
   [form-action-src-allowed]
     expected: FAIL
 
-  [Expecting logs: ["violated-directive=form-action","TEST COMPLETE"\]]
-    expected: FAIL
-
--- a/testing/web-platform/meta/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.ini
@@ -1,7 +1,6 @@
 [form-action-src-javascript-blocked.sub.html]
+  type: testharness
+  prefs: [security.csp.enable_violation_events:true]
   [form-action-src-javascript-blocked]
     expected: FAIL
 
-  [Expecting logs: ["violated-directive=form-action","TEST COMPLETE"\]]
-    expected: FAIL
-
--- a/testing/web-platform/meta/content-security-policy/generic/generic-0_10_1.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/generic/generic-0_10_1.sub.html.ini
@@ -1,5 +1,3 @@
 [generic-0_10_1.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire violation events for every failed violation]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/generic/generic-0_2_2.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/generic/generic-0_2_2.sub.html.ini
@@ -1,5 +1,3 @@
 [generic-0_2_2.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire violation events for every failed violation]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/generic/generic-0_2_3.html.ini
+++ b/testing/web-platform/meta/content-security-policy/generic/generic-0_2_3.html.ini
@@ -1,5 +1,3 @@
 [generic-0_2_3.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire violation events for every failed violation]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/generic/generic-0_8_1.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/generic/generic-0_8_1.sub.html.ini
@@ -1,5 +1,3 @@
 [generic-0_8_1.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire violation events for every failed violation]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/img-src/report-blocked-data-uri.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/img-src/report-blocked-data-uri.sub.html.ini
@@ -1,4 +1,3 @@
 [report-blocked-data-uri.sub.html]
-  [Expecting logs: ["violated-directive=img-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/object-src/object-src-url-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/object-src/object-src-url-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [object-src-url-blocked.sub.html]
-  [Expecting logs: ["violated-directive=object-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub.html.ini
@@ -1,8 +1,5 @@
 [reporting-api-report-only-sends-reports-on-violation.https.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Event is fired]
-    expected: FAIL
-
   [Violation report status OK.]
     expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-1.https.sub.html.ini
@@ -1,5 +1,3 @@
 [reporting-api-report-to-overrides-report-uri-1.https.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Event is fired]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/reporting/reporting-api-report-to-overrides-report-uri-2.https.sub.html.ini
@@ -1,5 +1,3 @@
 [reporting-api-report-to-overrides-report-uri-2.https.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Event is fired]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub.html.ini
@@ -1,8 +1,5 @@
 [reporting-api-sends-reports-on-violation.https.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Event is fired]
-    expected: FAIL
-
   [Violation report status OK.]
     expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/injected-inline-script-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/injected-inline-script-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [injected-inline-script-blocked.sub.html]
-  [Expecting logs: ["violated-directive=script-src",\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-1_1.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-1_1.html.ini
@@ -1,5 +1,3 @@
 [script-src-1_1.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should not fire policy violation events]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-1_2.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-1_2.html.ini
@@ -1,7 +1,5 @@
 [script-src-1_2.html]
   disabled:
     if os == "win": bug 1172411
   prefs: [security.csp.enable_violation_events:true]
-  [Should not fire policy violation events]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-1_2_1.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-1_2_1.html.ini
@@ -1,7 +1,5 @@
 [script-src-1_2_1.html]
   disabled:
     if os == "win": bug 1094323
   prefs: [security.csp.enable_violation_events:true]
-  [Test that securitypolicyviolation event is fired]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-1_4.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-1_4.html.ini
@@ -1,8 +1,5 @@
 [script-src-1_4.html]
   prefs: [security.csp.enable_violation_events:true]
   [eval() should throw without 'unsafe-eval' keyword source in script-src directive.]
     expected: FAIL
 
-  [Test that securitypolicyviolation event is fired]
-    expected: FAIL
-
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-1_4_1.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-1_4_1.html.ini
@@ -1,7 +1,5 @@
 [script-src-1_4_1.html]
   disabled:
     if os == "win": bug 1094323
   prefs: [security.csp.enable_violation_events:true]
-  [Test that securitypolicyviolation event is fired]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-1_4_2.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-1_4_2.html.ini
@@ -1,8 +1,5 @@
 [script-src-1_4_2.html]
   prefs: [security.csp.enable_violation_events:true]
   [Unsafe eval ran in Function() constructor.]
     expected: FAIL
 
-  [Test that securitypolicyviolation event is fired]
-    expected: FAIL
-
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_discard_whitelist.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_discard_whitelist.html.ini
@@ -1,5 +1,3 @@
 [script-src-strict_dynamic_discard_whitelist.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Whitelisted script without a correct nonce is not allowed with `strict-dynamic`.]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html.ini
@@ -1,5 +1,3 @@
 [script-src-strict_dynamic_double_policy_different_nonce.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Unnonced script injected via `appendChild` is not allowed with `strict-dynamic` + a nonce-only double policy.]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html.ini
@@ -1,5 +1,4 @@
 [script-src-strict_dynamic_double_policy_report_only.html]
+  type: testharness
   prefs: [security.csp.enable_violation_events:true]
-  [Script injected via `appendChild` is allowed with `strict-dynamic` + Report-Only `script-src 'none'` policy.]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html.ini
@@ -1,5 +1,3 @@
 [script-src-strict_dynamic_javascript_uri.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Script injected via `javascript:` URIs are not allowed with `strict-dynamic`.]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html.ini
@@ -1,5 +1,3 @@
 [script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html]
   prefs: [security.csp.enable_violation_events:true]
-  [All the expected CSP violation reports have been fired.]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.ini
@@ -1,33 +1,9 @@
 [script-src-strict_dynamic_parser_inserted.html]
   expected: TIMEOUT
   prefs: [security.csp.enable_violation_events:true]
-  [Parser-inserted script via `document.write` without a correct nonce is not allowed with `strict-dynamic`.]
-    expected: FAIL
-
-  [Parser-inserted script via `document.writeln` without a correct nonce is not allowed with `strict-dynamic`.]
-    expected: FAIL
-
-  [Parser-inserted deferred script via `document.write` without a correct nonce is not allowed with `strict-dynamic`.]
-    expected: FAIL
-
-  [Parser-inserted deferred script via `document.writeln` without a correct nonce is not allowed with `strict-dynamic`.]
-    expected: FAIL
-
-  [Parser-inserted async script via `document.write` without a correct nonce is not allowed with `strict-dynamic`.]
-    expected: FAIL
-
-  [Parser-inserted async script via `document.writeln` without a correct nonce is not allowed with `strict-dynamic`.]
-    expected: FAIL
-
-  [Parser-inserted deferred async script via `document.write` without a correct nonce is not allowed with `strict-dynamic`.]
-    expected: FAIL
-
-  [Parser-inserted deferred async script via `document.writeln` without a correct nonce is not allowed with `strict-dynamic`.]
-    expected: FAIL
-
   [Script injected via `innerHTML` is not allowed with `strict-dynamic`.]
     expected: TIMEOUT
 
   [Script injected via `insertAdjacentHTML` is not allowed with `strict-dynamic`.]
     expected: TIMEOUT
 
--- a/testing/web-platform/meta/content-security-policy/script-src/scripthash-unicode-normalization.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/scripthash-unicode-normalization.sub.html.ini
@@ -1,5 +1,3 @@
 [scripthash-unicode-normalization.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire securitypolicyviolation]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html.ini
@@ -1,5 +1,3 @@
 [scriptnonce-and-scripthash.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Expecting alerts: ["PASS (1/3)","PASS (2/3)","PASS (3/3)"\]]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html.ini
@@ -1,5 +1,3 @@
 [scriptnonce-ignore-unsafeinline.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Expecting alerts: ["PASS (1/2)","PASS (2/2)", "violated-directive=script-src"\]]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html.ini
@@ -1,5 +1,3 @@
 [securitypolicyviolation-block-image.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Non-redirected same-origin URLs are not stripped.]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.ini
+++ b/testing/web-platform/meta/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.ini
@@ -1,11 +1,4 @@
 [upgrade-insecure-requests-reporting.https.html]
-  expected: TIMEOUT
-  [Upgraded image is reported]
-    expected: TIMEOUT
+  type: testharness
+  prefs: [security.csp.enable_violation_events:true]
 
-  [Upgraded iframe is reported]
-    expected: TIMEOUT
-
-  [Navigated iframe is upgraded and reported]
-    expected: TIMEOUT
-
--- a/testing/web-platform/meta/content-security-policy/style-src/injected-inline-style-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/injected-inline-style-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [injected-inline-style-blocked.sub.html]
-  [Expecting logs: ["violated-directive=style-src","PASS"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html.ini
@@ -1,5 +1,3 @@
 [inline-style-allowed-while-cloning-objects.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Test that violation report event was fired]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/inline-style-attribute-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/inline-style-attribute-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [inline-style-attribute-blocked.sub.html]
-  [Expecting logs: ["violated-directive=style-src","PASS"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [style-blocked.sub.html]
-  [Expecting logs: ["violated-directive=style-src","PASS"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-hash-blocked.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-hash-blocked.html.ini
@@ -1,5 +1,3 @@
 [style-src-hash-blocked.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-imported-style-blocked.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-imported-style-blocked.html.ini
@@ -1,5 +1,4 @@
 [style-src-imported-style-blocked.html]
+  type: testharness
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-injected-inline-style-blocked.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-injected-inline-style-blocked.html.ini
@@ -1,5 +1,3 @@
 [style-src-injected-inline-style-blocked.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-injected-stylesheet-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-injected-stylesheet-blocked.sub.html.ini
@@ -1,5 +1,3 @@
 [style-src-injected-stylesheet-blocked.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-attribute-blocked.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-attribute-blocked.html.ini
@@ -1,5 +1,3 @@
 [style-src-inline-style-attribute-blocked.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-blocked.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-blocked.html.ini
@@ -1,5 +1,3 @@
 [style-src-inline-style-blocked.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html.ini
@@ -1,9 +1,6 @@
 [style-src-inline-style-nonce-blocked-error-event.html]
   expected: TIMEOUT
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
-
   [Test that paragraph remains unmodified and error events received.]
     expected: NOTRUN
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-nonce-blocked.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-inline-style-nonce-blocked.html.ini
@@ -1,5 +1,3 @@
 [style-src-inline-style-nonce-blocked.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-none-blocked.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-none-blocked.html.ini
@@ -1,5 +1,3 @@
 [style-src-none-blocked.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-stylesheet-nonce-blocked.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-stylesheet-nonce-blocked.html.ini
@@ -1,5 +1,3 @@
 [style-src-stylesheet-nonce-blocked.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire a securitypolicyviolation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/stylehash-basic-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/stylehash-basic-blocked.sub.html.ini
@@ -1,5 +1,3 @@
 [stylehash-basic-blocked.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Expecting alerts: ["PASS: The 'p' element's text is green, which means the style was correctly applied.", "violated-directive=style-src"\]]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/stylenonce-allowed.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/stylenonce-allowed.sub.html.ini
@@ -1,5 +1,4 @@
 [stylenonce-allowed.sub.html]
+  type: testharness
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire securitypolicyviolation]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/style-src/stylenonce-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/stylenonce-blocked.sub.html.ini
@@ -1,5 +1,4 @@
 [stylenonce-blocked.sub.html]
+  type: testharness
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire securitypolicyviolation]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/svg/object-in-svg-foreignobject.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/svg/object-in-svg-foreignobject.sub.html.ini
@@ -1,5 +1,3 @@
 [object-in-svg-foreignobject.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should throw a securitypolicyviolation]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/svg/svg-inline.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/svg/svg-inline.sub.html.ini
@@ -1,5 +1,3 @@
 [svg-inline.sub.html]
   prefs: [security.csp.enable_violation_events:true]
-  [Should fire violation event]
-    expected: FAIL
 
--- a/testing/web-platform/meta/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html.ini
@@ -1,4 +1,3 @@
 [eval-blocked-and-sends-report.sub.html]
-  [Expecting logs: ["PASS: eval() blocked.","violated-directive=script-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/unsafe-eval/eval-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/unsafe-eval/eval-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [eval-blocked.sub.html]
-  [Expecting logs: ["PASS EvalError","PASS EvalError", "violated-directive=script-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [eval-scripts-setInterval-blocked.sub.html]
-  [Expecting logs: ["PASS","violated-directive=script-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [eval-scripts-setTimeout-blocked.sub.html]
-  [Expecting logs: ["PASS","violated-directive=script-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]
 
--- a/testing/web-platform/meta/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html.ini
@@ -1,4 +1,3 @@
 [function-constructor-blocked.sub.html]
-  [Expecting logs: ["PASS EvalError","violated-directive=script-src"\]]
-    expected: FAIL
+  prefs: [security.csp.enable_violation_events:true]