Bug 915824 - Move CSP tests from content/base/test into content/base/test/csp directory. r=geekboy
authorYeuk Hon Wong <yeukhon@acm.org>
Tue, 18 Feb 2014 09:47:53 -0500
changeset 169662 01df9ef2b4048f1bb86c80518f5abea8450a1359
parent 169661 1a0927d0558bdacda2274212065683ea2d8e1d0c
child 169663 3cfe63cb3de2c9ad6edd07e94fcd2024f952f1cc
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersgeekboy
bugs915824
milestone30.0a1
Bug 915824 - Move CSP tests from content/base/test into content/base/test/csp directory. r=geekboy
content/base/test/csp/file_csp_report.sjs
content/base/test/csp/file_multi_policy_injection_bypass.html
content/base/test/csp/file_multi_policy_injection_bypass.html^headers^
content/base/test/csp/file_multi_policy_injection_bypass_2.html
content/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^
content/base/test/csp/file_policyuri_async_fetch.html
content/base/test/csp/file_policyuri_async_fetch.html^headers^
content/base/test/csp/file_redirect_content.sjs
content/base/test/csp/file_redirect_report.sjs
content/base/test/csp/file_subframe_run_js_if_allowed.html
content/base/test/csp/file_subframe_run_js_if_allowed.html^headers^
content/base/test/csp/mochitest.ini
content/base/test/csp/test_301_redirect.html
content/base/test/csp/test_302_redirect.html
content/base/test/csp/test_303_redirect.html
content/base/test/csp/test_307_redirect.html
content/base/test/csp/test_csp_report.html
content/base/test/csp/test_multi_policy_injection_bypass.html
content/base/test/csp/test_policyuri_async_fetch.html
content/base/test/csp/test_subframe_run_js_if_allowed.html
content/base/test/file_bug548193.sjs
content/base/test/file_bug558431.html
content/base/test/file_bug558431.html^headers^
content/base/test/file_bug650386_content.sjs
content/base/test/file_bug650386_report.sjs
content/base/test/file_bug702439.html
content/base/test/file_bug717511.html
content/base/test/file_bug717511.html^headers^
content/base/test/file_bug717511_2.html
content/base/test/file_bug717511_2.html^headers^
content/base/test/mochitest.ini
content/base/test/test_bug548193.html
content/base/test/test_bug558431.html
content/base/test/test_bug650386_redirect_301.html
content/base/test/test_bug650386_redirect_302.html
content/base/test/test_bug650386_redirect_303.html
content/base/test/test_bug650386_redirect_307.html
content/base/test/test_bug702439.html
content/base/test/test_bug702439.html^headers^
content/base/test/test_bug717511.html
testing/mochitest/b2g-debug.json
testing/mochitest/b2g-desktop.json
testing/mochitest/b2g.json
rename from content/base/test/file_bug548193.sjs
rename to content/base/test/csp/file_csp_report.sjs
--- a/content/base/test/file_bug548193.sjs
+++ b/content/base/test/csp/file_csp_report.sjs
@@ -1,9 +1,10 @@
 // SJS file for CSP violation report test
+// https://bugzilla.mozilla.org/show_bug.cgi?id=548193
 function handleRequest(request, response)
 {
   var query = {};
   request.queryString.split('&').forEach(function (val) {
     var [name, value] = val.split('=');
     query[name] = unescape(value);
   });
 
rename from content/base/test/file_bug717511.html
rename to content/base/test/csp/file_multi_policy_injection_bypass.html
--- a/content/base/test/file_bug717511.html
+++ b/content/base/test/csp/file_multi_policy_injection_bypass.html
@@ -1,9 +1,12 @@
 <html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=717511
+-->
   <body>
     <!-- these should be stopped by CSP after fixing bug 717511.  :) -->
     <img src="http://example.org/tests/content/base/test/file_CSP.sjs?testid=img_bad&type=img/png"> </img>
     <script src='http://example.org/tests/content/base/test/file_CSP.sjs?testid=script_bad&type=text/javascript'></script>
 
     <!-- these should load ok after fixing bug 717511.  :) -->
     <img src="file_CSP.sjs?testid=img_good&type=img/png" />
     <script src='file_CSP.sjs?testid=script_good&type=text/javascript'></script>
rename from content/base/test/file_bug717511.html^headers^
rename to content/base/test/csp/file_multi_policy_injection_bypass.html^headers^
rename from content/base/test/file_bug717511_2.html
rename to content/base/test/csp/file_multi_policy_injection_bypass_2.html
--- a/content/base/test/file_bug717511_2.html
+++ b/content/base/test/csp/file_multi_policy_injection_bypass_2.html
@@ -1,9 +1,12 @@
 <html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=717511
+-->
   <body>
     <!-- these should be stopped by CSP after fixing bug 717511.  :) -->
     <img src="http://example.org/tests/content/base/test/file_CSP.sjs?testid=img2_bad&type=img/png"> </img>
     <script src='http://example.org/tests/content/base/test/file_CSP.sjs?testid=script2_bad&type=text/javascript'></script>
 
     <!-- these should load ok after fixing bug 717511.  :) -->
     <img src="file_CSP.sjs?testid=img2_good&type=img/png" />
     <script src='file_CSP.sjs?testid=script2_good&type=text/javascript'></script>
rename from content/base/test/file_bug717511_2.html^headers^
rename to content/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^
rename from content/base/test/file_bug558431.html
rename to content/base/test/csp/file_policyuri_async_fetch.html
--- a/content/base/test/file_bug558431.html
+++ b/content/base/test/csp/file_policyuri_async_fetch.html
@@ -1,2 +1,5 @@
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=558431
+-->
 <iframe id="inner"
         src="/tests/content/base/test/file_CSP.sjs?content=%3Cdiv%20id%3D%22test%22%3Etest%20558431%3C/div%3E"></iframe>
rename from content/base/test/file_bug558431.html^headers^
rename to content/base/test/csp/file_policyuri_async_fetch.html^headers^
rename from content/base/test/file_bug650386_content.sjs
rename to content/base/test/csp/file_redirect_content.sjs
--- a/content/base/test/file_bug650386_content.sjs
+++ b/content/base/test/csp/file_redirect_content.sjs
@@ -1,11 +1,12 @@
-// SJS file for tests for bug650386, serves file_bug650386_content.html
+// https://bugzilla.mozilla.org/show_bug.cgi?id=650386
+// This SJS file serves file_redirect_content.html
 // with a CSP that will trigger a violation and that will report it
-// to file_bug650386_report.sjs
+// to file_redirect_report.sjs
 //
 // This handles 301, 302, 303 and 307 redirects. The HTTP status code
 // returned/type of redirect to do comes from the query string
 // parameter passed in from the test_bug650386_* files and then also
 // uses that value in the report-uri parameter of the CSP
 function handleRequest(request, response) {
   response.setHeader("Cache-Control", "no-cache", false);
 
@@ -17,17 +18,17 @@ function handleRequest(request, response
     // do a 302 redirect to the same URL as the report URI
     // redirects to - this will fail the test.
     var loc = "http://example.com/some/fake/path";
     response.setStatusLine("1.1", 302, "Found");
     response.setHeader("Location", loc, false);
     return;
   }
 
-  var csp = "default-src \'self\';report-uri http://mochi.test:8888/tests/content/base/test/file_bug650386_report.sjs?" + redirect;
+  var csp = "default-src \'self\';report-uri http://mochi.test:8888/tests/content/base/test/csp/file_redirect_report.sjs?" + redirect;
 
   response.setHeader("X-Content-Security-Policy", csp, false);
 
   // the actual file content.
   // this image load will (intentionally) fail due to the CSP policy of default-src: 'self'
   // specified by the CSP string above.
   var content = "<!DOCTYPE HTML><html><body><img src = \"http://some.other.domain.example.com\"></body></html>";
 
rename from content/base/test/file_bug650386_report.sjs
rename to content/base/test/csp/file_redirect_report.sjs
--- a/content/base/test/file_bug650386_report.sjs
+++ b/content/base/test/csp/file_redirect_report.sjs
@@ -1,9 +1,10 @@
-// SJS file for tests for bug650386, this serves as CSP violation report target
+// https://bugzilla.mozilla.org/show_bug.cgi?id=650386
+// This SJS file serves as CSP violation report target
 // and issues a redirect, to make sure the browser does not post to the target
 // of the redirect, per CSP spec.
 // This handles 301, 302, 303 and 307 redirects. The HTTP status code
 // returned/type of redirect to do comes from the query string
 // parameter
 function handleRequest(request, response) {
   response.setHeader("Cache-Control", "no-cache", false);
 
rename from content/base/test/file_bug702439.html
rename to content/base/test/csp/file_subframe_run_js_if_allowed.html
--- a/content/base/test/file_bug702439.html
+++ b/content/base/test/csp/file_subframe_run_js_if_allowed.html
@@ -1,11 +1,13 @@
 <html>
 <!--
-    This document is a child frame of a CSP document and the
-    test verifies that it is permitted to run javascript: URLs
-    if the parent has a policy that allows them.
+https://bugzilla.mozilla.org/show_bug.cgi?id=702439
+
+This document is a child frame of a CSP document and the
+test verifies that it is permitted to run javascript: URLs
+if the parent has a policy that allows them.
 -->
 <body onload="document.getElementById('a').click()">
 <a id="a" href="javascript:parent.javascript_link_ran = true;
                 parent.checkResult();">click</a>
 </body>
 </html>
rename from content/base/test/test_bug702439.html^headers^
rename to content/base/test/csp/file_subframe_run_js_if_allowed.html^headers^
--- a/content/base/test/csp/mochitest.ini
+++ b/content/base/test/csp/mochitest.ini
@@ -108,16 +108,27 @@ support-files =
   file_dual_headers_warning.html^headers^
   file_self_none_as_hostname_confusion.html
   file_self_none_as_hostname_confusion.html^headers^
   file_csp_testserver.sjs
   file_csp_regexp_parsing.html
   file_csp_regexp_parsing.js
   file_report_uri_missing_in_report_only_header.html
   file_report_uri_missing_in_report_only_header.html^headers^
+  file_csp_report.sjs
+  file_policyuri_async_fetch.html
+  file_policyuri_async_fetch.html^headers^
+  file_redirect_content.sjs
+  file_redirect_report.sjs
+  file_subframe_run_js_if_allowed.html
+  file_subframe_run_js_if_allowed.html^headers^
+  file_multi_policy_injection_bypass.html
+  file_multi_policy_injection_bypass.html^headers^
+  file_multi_policy_injection_bypass_2.html
+  file_multi_policy_injection_bypass_2.html^headers^
 
 [test_CSP.html]
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_CSP_bug663567.html]
 [test_CSP_bug802872.html]
 [test_CSP_bug885433.html]
 [test_CSP_bug888172.html]
 [test_CSP_bug916446.html]
@@ -140,8 +151,16 @@ skip-if = toolkit == 'android' #TIMED_OU
 [test_nonce_source.html]
 [test_CSP_bug941404.html]
 [test_hash_source.html]
 [test_dual_headers_warning.html]
 [test_self_none_as_hostname_confusion.html]
 [test_bug949549.html]
 [test_csp_regexp_parsing.html]
 [test_report_uri_missing_in_report_only_header.html]
+[test_csp_report.html]
+[test_policyuri_async_fetch.html]
+[test_301_redirect.html]
+[test_302_redirect.html]
+[test_303_redirect.html]
+[test_307_redirect.html]
+[test_subframe_run_js_if_allowed.html]
+[test_multi_policy_injection_bypass.html]
rename from content/base/test/test_bug650386_redirect_301.html
rename to content/base/test/csp/test_301_redirect.html
--- a/content/base/test/test_bug650386_redirect_301.html
+++ b/content/base/test/csp/test_301_redirect.html
@@ -66,13 +66,13 @@ window.done = function(result) {
   // clean up observers and finish the test
   window.examiner.remove();
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
 
 // save this for last so that our listeners are registered.
-document.getElementById('content_iframe').src = 'file_bug650386_content.sjs?301';
+document.getElementById('content_iframe').src = 'file_redirect_content.sjs?301';
 </script>
 </pre>
 </body>
 </html>
rename from content/base/test/test_bug650386_redirect_302.html
rename to content/base/test/csp/test_302_redirect.html
--- a/content/base/test/test_bug650386_redirect_302.html
+++ b/content/base/test/csp/test_302_redirect.html
@@ -66,13 +66,13 @@ window.done = function(result) {
   // clean up observers and finish the test
   window.examiner.remove();
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
 
 // save this for last so that our listeners are registered.
-document.getElementById('content_iframe').src = 'file_bug650386_content.sjs?302';
+document.getElementById('content_iframe').src = 'file_redirect_content.sjs?302';
 </script>
 </pre>
 </body>
 </html>
rename from content/base/test/test_bug650386_redirect_303.html
rename to content/base/test/csp/test_303_redirect.html
--- a/content/base/test/test_bug650386_redirect_303.html
+++ b/content/base/test/csp/test_303_redirect.html
@@ -66,13 +66,13 @@ window.done = function(result) {
   // clean up observers and finish the test
   window.examiner.remove();
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
 
 // save this for last so that our listeners are registered.
-document.getElementById('content_iframe').src = 'file_bug650386_content.sjs?303';
+document.getElementById('content_iframe').src = 'file_redirect_content.sjs?303';
 </script>
 </pre>
 </body>
 </html>
rename from content/base/test/test_bug650386_redirect_307.html
rename to content/base/test/csp/test_307_redirect.html
--- a/content/base/test/test_bug650386_redirect_307.html
+++ b/content/base/test/csp/test_307_redirect.html
@@ -66,13 +66,13 @@ window.done = function(result) {
   // clean up observers and finish the test
   window.examiner.remove();
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
 
 // save this for last so that our listeners are registered.
-document.getElementById('content_iframe').src = 'file_bug650386_content.sjs?307';
+document.getElementById('content_iframe').src = 'file_redirect_content.sjs?307';
 </script>
 </pre>
 </body>
 </html>
rename from content/base/test/test_bug548193.html
rename to content/base/test/csp/test_csp_report.html
--- a/content/base/test/test_bug548193.html
+++ b/content/base/test/csp/test_csp_report.html
@@ -1,12 +1,15 @@
 <!DOCTYPE HTML>
 <html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=548193
+-->
 <head>
-  <title>Test for CSP JSON violation report</title>
+  <title>Test for Bug 548193</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 
@@ -68,23 +71,23 @@ examiner.prototype  = {
 
   // remove the listener
   remove: function() {
     SpecialPowers.removeObserver(this, "http-on-opening-request");
   }
 }
 
 // content file that triggers a violation report
-var testFile = "file_bug548193.sjs";
+var testFile = "file_csp_report.sjs";
 
 window.checkResults = function(reportObj) {
   var cspReport = reportObj["csp-report"];
   // correct violating request
   is(cspReport["document-uri"],
-     "http://mochi.test:8888/tests/content/base/test/" + testFile,
+     "http://mochi.test:8888/tests/content/base/test/csp/" + testFile,
      "Incorrect violating request");
   // correct blocked-uri
   is(cspReport["blocked-uri"],
      "http://example.org/tests/content/base/test/file_CSP.sjs?testid=img_bad&type=img/png",
      "Incorrect blocked uri");
   // correct violated-directive
   is(cspReport["violated-directive"], "default-src http://mochi.test:8888",
      "Incorrect violated directive");
rename from content/base/test/test_bug717511.html
rename to content/base/test/csp/test_multi_policy_injection_bypass.html
--- a/content/base/test/test_bug717511.html
+++ b/content/base/test/csp/test_multi_policy_injection_bypass.html
@@ -110,15 +110,15 @@ window.testResult = function(testname, r
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
 
 // save this for last so that our listeners are registered.
 // ... this loads the testbed of good and bad requests.
 
-document.getElementById('cspframe').src = 'file_bug717511.html';
-document.getElementById('cspframe2').src = 'file_bug717511_2.html';
+document.getElementById('cspframe').src = 'file_multi_policy_injection_bypass.html';
+document.getElementById('cspframe2').src = 'file_multi_policy_injection_bypass_2.html';
 
 </script>
 </pre>
 </body>
 </html>
rename from content/base/test/test_bug558431.html
rename to content/base/test/csp/test_policyuri_async_fetch.html
--- a/content/base/test/test_bug558431.html
+++ b/content/base/test/csp/test_policyuri_async_fetch.html
@@ -1,13 +1,16 @@
 <!DOCTYPE HTML>
 <html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=558431
+-->
 <head>
-  <title>Test for CSP async policy-uri</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <title>Test for Bug 558431</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <iframe id="cspframe"></iframe>
 <script type="text/javascript">
 // This tests that a policy is still attempted to be fetched
 // asynchronously (bug 558431) and that a default policy of
 // |allow 'none'| is applied when the fetching fails.
@@ -19,13 +22,13 @@ f.addEventListener('load', function() {
   var test = inner.contentDocument.getElementById("test");
   // the inner document should not exist because it has an invalid
   // policy-uri and should have been blocked by the default
   // |allow 'none'| policy that was applied
   is(test, null, "test inner document");
   SimpleTest.finish();
 }, false);
 // load the test frame
-f.src = "file_bug558431.html";
+f.src = "file_policyuri_async_fetch.html";
 SimpleTest.waitForExplicitFinish();
 </script>
 </body>
 </html>
rename from content/base/test/test_bug702439.html
rename to content/base/test/csp/test_subframe_run_js_if_allowed.html
--- a/content/base/test/test_bug702439.html
+++ b/content/base/test/csp/test_subframe_run_js_if_allowed.html
@@ -3,17 +3,17 @@
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=702439
 
 This test verifies that child iframes of CSP documents are
 permitted to execute javascript: URLs assuming the policy
 allows this.
 -->
 <head>
-  <title>Test for Bug 428847</title>
+  <title>Test for Bug 702439</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <script class="testbody" type="text/javascript">
 var javascript_link_ran = false;
 
 // check that the script in the child frame's javascript: URL ran
@@ -22,11 +22,11 @@ function checkResult()
   is(javascript_link_ran, true,
      "javascript URL didn't execute");
 
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
 </script>
-<iframe id="i" src="file_bug702439.html"></iframe>
+<iframe id="i" src="file_subframe_run_js_if_allowed.html"></iframe>
 </body>
 </html>
--- a/content/base/test/mochitest.ini
+++ b/content/base/test/mochitest.ini
@@ -89,56 +89,46 @@ support-files =
   file_bug428847-2.xhtml
   file_bug498897.css
   file_bug498897.html
   file_bug498897.html^headers^
   file_bug503481.sjs
   file_bug503481b_inner.html
   file_bug541937.html
   file_bug541937.xhtml
-  file_bug548193.sjs
   file_bug557892.html
-  file_bug558431.html
-  file_bug558431.html^headers^
   file_bug562137.txt
   file_bug590812-ref.xhtml
   file_bug590812.xml
   file_bug590870.html
   file_bug601803a.html
   file_bug601803b.html
   file_bug604660-1.xml
   file_bug604660-2.xsl
   file_bug604660-3.js
   file_bug604660-4.js
   file_bug604660-5.xml
   file_bug604660-6.xsl
   file_bug622088.sjs
   file_bug622088_inner.html
-  file_bug650386_content.sjs
-  file_bug650386_report.sjs
   file_bug675121.sjs
   file_bug687859-16.js
   file_bug687859-16.js^headers^
   file_bug687859-bom.js
   file_bug687859-bom.js^headers^
   file_bug687859-charset.js
   file_bug687859-http.js
   file_bug687859-http.js^headers^
   file_bug687859-inherit.js
   file_bug692434.xml
-  file_bug702439.html
   file_bug707142_baseline.json
   file_bug707142_bom.json
   file_bug707142_utf-16.json
   file_bug708620-2.html
   file_bug708620.html
-  file_bug717511.html
-  file_bug717511.html^headers^
-  file_bug717511_2.html
-  file_bug717511_2.html^headers^
   file_bug782342.txt
   file_bug787778.sjs
   file_bug804395.jar
   file_bug869432.eventsource
   file_bug869432.eventsource^headers^
   file_bug902350.html
   file_bug902350_frame.html
   file_bug907892.html
@@ -417,21 +407,19 @@ skip-if = toolkit == 'android' #TIMED_OU
 [test_bug515401.html]
 [test_bug518104.html]
 [test_bug527896.html]
 [test_bug540854.html]
 [test_bug541937.html]
 [test_bug544642.html]
 [test_bug545644.html]
 [test_bug545644.xhtml]
-[test_bug548193.html]
 [test_bug548463.html]
 [test_bug553896.xhtml]
 [test_bug557892.html]
-[test_bug558431.html]
 [test_bug558726.html]
 [test_bug559526.html]
 [test_bug560780.html]
 [test_bug562137.html]
 [test_bug562169-1.html]
 [test_bug562169-2.html]
 [test_bug562652.html]
 [test_bug564047.html]
@@ -460,20 +448,16 @@ skip-if = toolkit == 'android' #bug 6870
 [test_bug622117.html]
 [test_bug622246.html]
 [test_bug625722.html]
 [test_bug626262.html]
 [test_bug628938.html]
 [test_bug631615.html]
 [test_bug638112.html]
 [test_bug647518.html]
-[test_bug650386_redirect_301.html]
-[test_bug650386_redirect_302.html]
-[test_bug650386_redirect_303.html]
-[test_bug650386_redirect_307.html]
 [test_bug656283.html]
 [test_bug664916.html]
 [test_bug666604.html]
 [test_bug675121.html]
 [test_bug675166.html]
 [test_bug682463.html]
 [test_bug682554.html]
 [test_bug682592.html]
@@ -485,24 +469,21 @@ skip-if = toolkit == 'android' #bug 6870
 [test_bug692434.html]
 [test_bug693615.html]
 [test_bug693875.html]
 [test_bug694754.xhtml]
 [test_bug696301-1.html]
 [test_bug696301-2.html]
 [test_bug698381.html]
 [test_bug698384.html]
-[test_bug702439.html]
-[test_bug702439.html^headers^]
 [test_bug704063.html]
 [test_bug707142.html]
 [test_bug708620.html]
 [test_bug711047.html]
 [test_bug711180.html]
-[test_bug717511.html]
 [test_bug719533.html]
 [test_bug726364.html]
 [test_bug737087.html]
 [test_bug737565.html]
 [test_bug737612.html]
 [test_bug738108.html]
 [test_bug744830.html]
 [test_bug749367.html]
--- a/testing/mochitest/b2g-debug.json
+++ b/testing/mochitest/b2g-debug.json
@@ -80,17 +80,17 @@
     "dom/imptests/html/dom/ranges/test_Range-mutations.html":"Test timed out.",
     "dom/encoding/test/test_stringencoding.html":"Test timed out on b2g board",
 
     "dom/events/test/test_bug615597.html":"bug 900969, 5 tests",
     "dom/events/test/test_bug667919-1.html":"bug 900969, 5 tests",
     "dom/events/test/test_bug667919-2.html":"bug 900969, 5 tests",
 
     "content/html/content/test/test_bug561636.html":"observerservice not working",
-    "content/base/test/test_bug548193.html":"observerservice issue",
+    "content/base/test/csp/test_csp_report.html":"observerservice issue",
     "content/base/test/test_x-frame-options.html":"observerservice issue",
 
     "content/base/test/test_XHRSendData.html":"seems to stall",
     "content/base/test/test_XHR_parameters.html":"86 total, 4 failing - testing mozAnon - got false, expected true",
     "content/base/test/test_XHR_system.html":"12 total, 2 failing - .mozSystem == true - got false, expected true + ",
 
     "content/base/test/test_bug431701.html":"xmlhttprequest causes crash, bug 902271",
     "content/base/test/test_bug422537.html":"xmlhttprequest causes crash, bug 902271",
@@ -216,21 +216,21 @@
     "content/base/test/csp/test_bug836922_npolicies.html":"observer not working",
     "content/base/test/csp/test_CSP_bug916446.html":"observer not working",
 
     "content/base/test/test_CrossSiteXHR_origin.html":"https not working, bug 907770",
     "content/base/test/test_plugin_freezing.html":"",
     "content/base/test/test_bug466409.html":"",
     "content/base/test/test_bug482935.html":"",
     "content/base/test/test_bug498433.html":"",
-    "content/base/test/test_bug650386_redirect_301.html":"",
-    "content/base/test/test_bug650386_redirect_302.html":"",
-    "content/base/test/test_bug650386_redirect_303.html":"",
-    "content/base/test/test_bug650386_redirect_307.html":"",
-    "content/base/test/test_bug717511.html":"",
+    "content/base/test/csp/test_301_redirect.html":"",
+    "content/base/test/csp/test_302_redirect.html":"",
+    "content/base/test/csp/test_303_redirect.html":"",
+    "content/base/test/csp/test_307_redirect.html":"",
+    "content/base/test/csp/test_multi_policy_injection_bypass.html":"",
     "content/base/test/test_copypaste.xhtml":"bug 904183",
     "content/base/test/test_copypaste.xul":"bug 904183",
     "content/base/test/csp/test_csp_redirects.html":"",
     "content/base/test/test_fileapi_slice.html":"",
     "content/base/test/test_mixed_content_blocker.html":"",
     "content/base/test/test_mixed_content_blocker_bug803225.html":"",
     "content/base/test/test_mixed_content_blocker_frameNavigation.html":"",
     "content/base/test/test_mozfiledataurl.html":"",
--- a/testing/mochitest/b2g-desktop.json
+++ b/testing/mochitest/b2g-desktop.json
@@ -81,17 +81,17 @@
     "dom/imptests/html/dom/ranges/test_Range-mutations.html":"Test timed out.",
     "dom/encoding/test/test_stringencoding.html":"Test timed out on b2g board",
 
     "dom/events/test/test_bug615597.html":"bug 900969, 5 tests",
     "dom/events/test/test_bug667919-1.html":"bug 900969, 5 tests",
     "dom/events/test/test_bug667919-2.html":"bug 900969, 5 tests",
 
     "content/html/content/test/test_bug561636.html":"observerservice not working",
-    "content/base/test/test_bug548193.html":"observerservice issue",
+    "content/base/test/csp/test_csp_report.html":"observerservice issue",
     "content/base/test/test_x-frame-options.html":"observerservice issue",
 
     "content/base/test/test_XHRSendData.html":"seems to stall",
     "content/base/test/test_XHR_parameters.html":"86 total, 4 failing - testing mozAnon - got false, expected true",
     "content/base/test/test_XHR_system.html":"12 total, 2 failing - .mozSystem == true - got false, expected true + ",
 
     "content/base/test/test_bug431701.html":"xmlhttprequest causes crash, bug 902271",
     "content/base/test/test_bug422537.html":"xmlhttprequest causes crash, bug 902271",
@@ -219,21 +219,21 @@
     "content/base/test/csp/test_bug836922_npolicies.html":"observer not working",
     "content/base/test/csp/test_CSP_bug916446.html":"observer not working",
 
     "content/base/test/test_CrossSiteXHR_origin.html":"https not working, bug 907770",
     "content/base/test/test_plugin_freezing.html":"",
     "content/base/test/test_bug466409.html":"",
     "content/base/test/test_bug482935.html":"",
     "content/base/test/test_bug498433.html":"",
-    "content/base/test/test_bug650386_redirect_301.html":"",
-    "content/base/test/test_bug650386_redirect_302.html":"",
-    "content/base/test/test_bug650386_redirect_303.html":"",
-    "content/base/test/test_bug650386_redirect_307.html":"",
-    "content/base/test/test_bug717511.html":"",
+    "content/base/test/csp/test_301_redirect.html":"",
+    "content/base/test/csp/test_302_redirect.html":"",
+    "content/base/test/csp/test_303_redirect.html":"",
+    "content/base/test/csp/test_307_redirect.html":"",
+    "content/base/test/csp/test_multi_policy_injection_bypass.html":"",
     "content/base/test/test_copypaste.xhtml":"bug 904183",
     "content/base/test/test_copypaste.xul":"bug 904183",
     "content/base/test/csp/test_csp_redirects.html":"",
     "content/base/test/test_fileapi_slice.html":"",
     "content/base/test/test_mixed_content_blocker.html":"",
     "content/base/test/test_mixed_content_blocker_bug803225.html":"",
     "content/base/test/test_mixed_content_blocker_frameNavigation.html":"",
     "content/base/test/test_mozfiledataurl.html":"",
--- a/testing/mochitest/b2g.json
+++ b/testing/mochitest/b2g.json
@@ -70,17 +70,17 @@
     "dom/events/test/test_bug426082.html":"1 failure out of 6, Moving the mouse down from the label should have unpressed the button",
     "dom/events/test/test_bug534833.html":"4 failures out of 6, bug 901564,click not fired, also disabled on Android",
     "dom/events/test/test_bug603008.html":"1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove",
     "dom/events/test/test_bug508479.html":"drag event, also fails on Android",
     "dom/events/test/test_dragstart.html":"drag event, also fails on Android",
     "dom/events/test/test_bug864040.html":"failing when the test gets moved around, and on debug",
 
     "content/html/content/test/test_bug561636.html":"observerservice not working",
-    "content/base/test/test_bug548193.html":"observerservice issue",
+    "content/base/test/csp/test_csp_report.html":"observerservice issue",
     "content/base/test/test_x-frame-options.html":"observerservice issue",
 
     "content/base/test/test_XHRSendData.html":"seems to stall",
     "content/base/test/test_XHR_parameters.html":"86 total, 4 failing - testing mozAnon - got false, expected true",
 
     "content/base/test/test_bug431701.html":"xmlhttprequest causes crash, bug 902271",
     "content/base/test/test_bug422537.html":"xmlhttprequest causes crash, bug 902271",
 
@@ -184,21 +184,21 @@
     "content/base/test/test_object.html":"needs plugin support",
     "content/base/test/test_bug827160.html": "needs plugin support",
 
     "content/base/test/test_CrossSiteXHR_origin.html":"https not working, bug 907770",
     "content/base/test/test_plugin_freezing.html":"",
     "content/base/test/test_bug466409.html":"",
     "content/base/test/test_bug482935.html":"",
     "content/base/test/test_bug498433.html":"",
-    "content/base/test/test_bug650386_redirect_301.html":"",
-    "content/base/test/test_bug650386_redirect_302.html":"",
-    "content/base/test/test_bug650386_redirect_303.html":"",
-    "content/base/test/test_bug650386_redirect_307.html":"",
-    "content/base/test/test_bug717511.html":"",
+    "content/base/test/csp/test_301_redirect.html":"",
+    "content/base/test/csp/test_302_redirect.html":"",
+    "content/base/test/csp/test_303_redirect.html":"",
+    "content/base/test/csp/test_307_redirect.html":"",
+    "content/base/test/csp/test_multi_policy_injection_bypass.html":"",
     "content/base/test/test_copypaste.xhtml":"bug 904183",
     "content/base/test/test_copypaste.xul":"bug 904183",
     "content/base/test/test_fileapi_slice.html":"",
     "content/base/test/test_mixed_content_blocker.html":"",
     "content/base/test/test_mixed_content_blocker_bug803225.html":"",
     "content/base/test/test_mixed_content_blocker_frameNavigation.html":"",
     "content/base/test/test_mozfiledataurl.html":"",
     "content/base/test/test_websocket.html":"",