Bug 1417383 - Move mochitests from docshell/test/ to docshell/test/mo…

…chitest/ to aid ESLint. r=qdot Depends on D7052 Differential Revision: https://phabricator.services.mozilla.com/D7053
Brli · Oct 2, 2018 · f4a6f9c · f4a6f9c
1 parent 5fc2d27
commit f4a6f9c
Show file tree

Hide file tree

Showing 109 changed files with 62 additions and 59 deletions.
diff --git a/docshell/moz.build b/docshell/moz.build
@@ -21,7 +21,7 @@ XPCSHELL_TESTS_MANIFESTS += [
 
 MOCHITEST_MANIFESTS += [
     'test/iframesandbox/mochitest.ini',
-    'test/mochitest.ini',
+    'test/mochitest/mochitest.ini',
     'test/navigation/mochitest.ini',
 ]
 

diff --git a/docshell/test/bug123696-subframe.html → ...ll/test/mochitest/bug123696-subframe.html b/docshell/test/bug123696-subframe.html → ...ll/test/mochitest/bug123696-subframe.html
diff --git a/docshell/test/bug404548-subframe.html → ...ll/test/mochitest/bug404548-subframe.html b/docshell/test/bug404548-subframe.html → ...ll/test/mochitest/bug404548-subframe.html
diff --git a/docshell/test/bug404548-subframe_window.html → .../mochitest/bug404548-subframe_window.html b/docshell/test/bug404548-subframe_window.html → .../mochitest/bug404548-subframe_window.html
diff --git a/docshell/test/bug413310-post.sjs → docshell/test/mochitest/bug413310-post.sjs b/docshell/test/bug413310-post.sjs → docshell/test/mochitest/bug413310-post.sjs
diff --git a/docshell/test/bug413310-subframe.html → ...ll/test/mochitest/bug413310-subframe.html b/docshell/test/bug413310-subframe.html → ...ll/test/mochitest/bug413310-subframe.html
diff --git a/docshell/test/bug529119-window.html → ...hell/test/mochitest/bug529119-window.html b/docshell/test/bug529119-window.html → ...hell/test/mochitest/bug529119-window.html
diff --git a/docshell/test/bug530396-noref.sjs → docshell/test/mochitest/bug530396-noref.sjs b/docshell/test/bug530396-noref.sjs → docshell/test/mochitest/bug530396-noref.sjs
diff --git a/docshell/test/bug530396-subframe.html → ...ll/test/mochitest/bug530396-subframe.html b/docshell/test/bug530396-subframe.html → ...ll/test/mochitest/bug530396-subframe.html
diff --git a/docshell/test/bug570341_recordevents.html → ...est/mochitest/bug570341_recordevents.html b/docshell/test/bug570341_recordevents.html → ...est/mochitest/bug570341_recordevents.html
diff --git a/docshell/test/bug668513_redirect.html → ...ll/test/mochitest/bug668513_redirect.html b/docshell/test/bug668513_redirect.html → ...ll/test/mochitest/bug668513_redirect.html
diff --git a/...ell/test/bug668513_redirect.html^headers^ → ...ochitest/bug668513_redirect.html^headers^ b/...ell/test/bug668513_redirect.html^headers^ → ...ochitest/bug668513_redirect.html^headers^
diff --git a/docshell/test/bug691547_frame.html → docshell/test/mochitest/bug691547_frame.html b/docshell/test/bug691547_frame.html → docshell/test/mochitest/bug691547_frame.html
diff --git a/docshell/test/dummy_page.html → docshell/test/mochitest/dummy_page.html b/docshell/test/dummy_page.html → docshell/test/mochitest/dummy_page.html
diff --git a/...le_anchor_scroll_after_document_open.html → ...le_anchor_scroll_after_document_open.html b/...le_anchor_scroll_after_document_open.html → ...le_anchor_scroll_after_document_open.html
diff --git a/docshell/test/file_bfcache_plus_hash_1.html → ...t/mochitest/file_bfcache_plus_hash_1.html b/docshell/test/file_bfcache_plus_hash_1.html → ...t/mochitest/file_bfcache_plus_hash_1.html
diff --git a/docshell/test/file_bfcache_plus_hash_2.html → ...t/mochitest/file_bfcache_plus_hash_2.html b/docshell/test/file_bfcache_plus_hash_2.html → ...t/mochitest/file_bfcache_plus_hash_2.html
diff --git a/docshell/test/file_bug1121701_1.html → ...ell/test/mochitest/file_bug1121701_1.html b/docshell/test/file_bug1121701_1.html → ...ell/test/mochitest/file_bug1121701_1.html
diff --git a/docshell/test/file_bug1121701_2.html → ...ell/test/mochitest/file_bug1121701_2.html b/docshell/test/file_bug1121701_2.html → ...ell/test/mochitest/file_bug1121701_2.html
diff --git a/docshell/test/file_bug1151421.html → docshell/test/mochitest/file_bug1151421.html b/docshell/test/file_bug1151421.html → docshell/test/mochitest/file_bug1151421.html
diff --git a/docshell/test/file_bug1186774.html → docshell/test/mochitest/file_bug1186774.html b/docshell/test/file_bug1186774.html → docshell/test/mochitest/file_bug1186774.html
diff --git a/docshell/test/file_bug1450164.html → docshell/test/mochitest/file_bug1450164.html b/docshell/test/file_bug1450164.html → docshell/test/mochitest/file_bug1450164.html
diff --git a/docshell/test/file_bug385434_1.html → ...hell/test/mochitest/file_bug385434_1.html b/docshell/test/file_bug385434_1.html → ...hell/test/mochitest/file_bug385434_1.html
diff --git a/docshell/test/file_bug385434_2.html → ...hell/test/mochitest/file_bug385434_2.html b/docshell/test/file_bug385434_2.html → ...hell/test/mochitest/file_bug385434_2.html
diff --git a/docshell/test/file_bug385434_3.html → ...hell/test/mochitest/file_bug385434_3.html b/docshell/test/file_bug385434_3.html → ...hell/test/mochitest/file_bug385434_3.html
diff --git a/docshell/test/file_bug475636.sjs → docshell/test/mochitest/file_bug475636.sjs b/docshell/test/file_bug475636.sjs → docshell/test/mochitest/file_bug475636.sjs
diff --git a/docshell/test/file_bug509055.html → docshell/test/mochitest/file_bug509055.html b/docshell/test/file_bug509055.html → docshell/test/mochitest/file_bug509055.html
diff --git a/docshell/test/file_bug511449.html → docshell/test/mochitest/file_bug511449.html b/docshell/test/file_bug511449.html → docshell/test/mochitest/file_bug511449.html
diff --git a/docshell/test/file_bug540462.html → docshell/test/mochitest/file_bug540462.html b/docshell/test/file_bug540462.html → docshell/test/mochitest/file_bug540462.html
diff --git a/docshell/test/file_bug580069_1.html → ...hell/test/mochitest/file_bug580069_1.html b/docshell/test/file_bug580069_1.html → ...hell/test/mochitest/file_bug580069_1.html
diff --git a/docshell/test/file_bug580069_2.sjs → docshell/test/mochitest/file_bug580069_2.sjs b/docshell/test/file_bug580069_2.sjs → docshell/test/mochitest/file_bug580069_2.sjs
diff --git a/docshell/test/file_bug590573_1.html → ...hell/test/mochitest/file_bug590573_1.html b/docshell/test/file_bug590573_1.html → ...hell/test/mochitest/file_bug590573_1.html
diff --git a/docshell/test/file_bug590573_2.html → ...hell/test/mochitest/file_bug590573_2.html b/docshell/test/file_bug590573_2.html → ...hell/test/mochitest/file_bug590573_2.html
diff --git a/docshell/test/file_bug598895_1.html → ...hell/test/mochitest/file_bug598895_1.html b/docshell/test/file_bug598895_1.html → ...hell/test/mochitest/file_bug598895_1.html
diff --git a/docshell/test/file_bug598895_2.html → ...hell/test/mochitest/file_bug598895_2.html b/docshell/test/file_bug598895_2.html → ...hell/test/mochitest/file_bug598895_2.html
diff --git a/docshell/test/file_bug634834.html → docshell/test/mochitest/file_bug634834.html b/docshell/test/file_bug634834.html → docshell/test/mochitest/file_bug634834.html
diff --git a/docshell/test/file_bug637644_1.html → ...hell/test/mochitest/file_bug637644_1.html b/docshell/test/file_bug637644_1.html → ...hell/test/mochitest/file_bug637644_1.html
diff --git a/docshell/test/file_bug637644_2.html → ...hell/test/mochitest/file_bug637644_2.html b/docshell/test/file_bug637644_2.html → ...hell/test/mochitest/file_bug637644_2.html
diff --git a/docshell/test/file_bug640387.html → docshell/test/mochitest/file_bug640387.html b/docshell/test/file_bug640387.html → docshell/test/mochitest/file_bug640387.html
diff --git a/docshell/test/file_bug653741.html → docshell/test/mochitest/file_bug653741.html b/docshell/test/file_bug653741.html → docshell/test/mochitest/file_bug653741.html
diff --git a/docshell/test/file_bug660404 → docshell/test/mochitest/file_bug660404 b/docshell/test/file_bug660404 → docshell/test/mochitest/file_bug660404
diff --git a/docshell/test/file_bug660404-1.html → ...hell/test/mochitest/file_bug660404-1.html b/docshell/test/file_bug660404-1.html → ...hell/test/mochitest/file_bug660404-1.html
diff --git a/docshell/test/file_bug660404^headers^ → ...ll/test/mochitest/file_bug660404^headers^ b/docshell/test/file_bug660404^headers^ → ...ll/test/mochitest/file_bug660404^headers^
diff --git a/docshell/test/file_bug662170.html → docshell/test/mochitest/file_bug662170.html b/docshell/test/file_bug662170.html → docshell/test/mochitest/file_bug662170.html
diff --git a/docshell/test/file_bug668513.html → docshell/test/mochitest/file_bug668513.html b/docshell/test/file_bug668513.html → docshell/test/mochitest/file_bug668513.html
diff --git a/docshell/test/file_bug669671.sjs → docshell/test/mochitest/file_bug669671.sjs b/docshell/test/file_bug669671.sjs → docshell/test/mochitest/file_bug669671.sjs
diff --git a/docshell/test/file_bug675587.html → docshell/test/mochitest/file_bug675587.html b/docshell/test/file_bug675587.html → docshell/test/mochitest/file_bug675587.html
diff --git a/docshell/test/file_bug680257.html → docshell/test/mochitest/file_bug680257.html b/docshell/test/file_bug680257.html → docshell/test/mochitest/file_bug680257.html
diff --git a/docshell/test/file_bug703855.html → docshell/test/mochitest/file_bug703855.html b/docshell/test/file_bug703855.html → docshell/test/mochitest/file_bug703855.html
diff --git a/docshell/test/file_bug728939.html → docshell/test/mochitest/file_bug728939.html b/docshell/test/file_bug728939.html → docshell/test/mochitest/file_bug728939.html
diff --git a/docshell/test/file_close_onpagehide1.html → ...est/mochitest/file_close_onpagehide1.html b/docshell/test/file_close_onpagehide1.html → ...est/mochitest/file_close_onpagehide1.html
diff --git a/docshell/test/file_close_onpagehide2.html → ...est/mochitest/file_close_onpagehide2.html b/docshell/test/file_close_onpagehide2.html → ...est/mochitest/file_close_onpagehide2.html
diff --git a/docshell/test/file_framedhistoryframes.html → ...t/mochitest/file_framedhistoryframes.html b/docshell/test/file_framedhistoryframes.html → ...t/mochitest/file_framedhistoryframes.html
diff --git a/...t/file_pushState_after_document_open.html → ...t/file_pushState_after_document_open.html b/...t/file_pushState_after_document_open.html → ...t/file_pushState_after_document_open.html
diff --git a/docshell/test/historyframes.html → docshell/test/mochitest/historyframes.html b/docshell/test/historyframes.html → docshell/test/mochitest/historyframes.html
@@ -50,7 +50,7 @@
   return gFrame.contentDocument.getElementById("text").textContent;
 }
 
-var BASE_URI = "http://mochi.test:8888/tests/docshell/test/";
+var BASE_URI = "http://mochi.test:8888/tests/docshell/test/mochitest/";
 var START = BASE_URI + "start_historyframe.html";
 var URL1 = BASE_URI + "url1_historyframe.html";
 var URL2 = BASE_URI + "url2_historyframe.html";

diff --git a/docshell/test/mochitest.ini → docshell/test/mochitest/mochitest.ini b/docshell/test/mochitest.ini → docshell/test/mochitest/mochitest.ini
diff --git a/docshell/test/start_historyframe.html → ...ll/test/mochitest/start_historyframe.html b/docshell/test/start_historyframe.html → ...ll/test/mochitest/start_historyframe.html
diff --git a/...st_anchor_scroll_after_document_open.html → ...st_anchor_scroll_after_document_open.html b/...st_anchor_scroll_after_document_open.html → ...st_anchor_scroll_after_document_open.html
diff --git a/docshell/test/test_bfcache_plus_hash.html → ...est/mochitest/test_bfcache_plus_hash.html b/docshell/test/test_bfcache_plus_hash.html → ...est/mochitest/test_bfcache_plus_hash.html
diff --git a/docshell/test/test_bug1045096.html → docshell/test/mochitest/test_bug1045096.html b/docshell/test/test_bug1045096.html → docshell/test/mochitest/test_bug1045096.html
diff --git a/docshell/test/test_bug1121701.html → docshell/test/mochitest/test_bug1121701.html b/docshell/test/test_bug1121701.html → docshell/test/mochitest/test_bug1121701.html
diff --git a/docshell/test/test_bug1151421.html → docshell/test/mochitest/test_bug1151421.html b/docshell/test/test_bug1151421.html → docshell/test/mochitest/test_bug1151421.html
diff --git a/docshell/test/test_bug1186774.html → docshell/test/mochitest/test_bug1186774.html b/docshell/test/test_bug1186774.html → docshell/test/mochitest/test_bug1186774.html
diff --git a/docshell/test/test_bug123696.html → docshell/test/mochitest/test_bug123696.html b/docshell/test/test_bug123696.html → docshell/test/mochitest/test_bug123696.html
diff --git a/docshell/test/test_bug1450164.html → docshell/test/mochitest/test_bug1450164.html b/docshell/test/test_bug1450164.html → docshell/test/mochitest/test_bug1450164.html
diff --git a/docshell/test/test_bug384014.html → docshell/test/mochitest/test_bug384014.html b/docshell/test/test_bug384014.html → docshell/test/mochitest/test_bug384014.html
diff --git a/docshell/test/test_bug385434.html → docshell/test/mochitest/test_bug385434.html b/docshell/test/test_bug385434.html → docshell/test/mochitest/test_bug385434.html
diff --git a/docshell/test/test_bug387979.html → docshell/test/mochitest/test_bug387979.html b/docshell/test/test_bug387979.html → docshell/test/mochitest/test_bug387979.html
diff --git a/docshell/test/test_bug402210.html → docshell/test/mochitest/test_bug402210.html b/docshell/test/test_bug402210.html → docshell/test/mochitest/test_bug402210.html
diff --git a/docshell/test/test_bug404548.html → docshell/test/mochitest/test_bug404548.html b/docshell/test/test_bug404548.html → docshell/test/mochitest/test_bug404548.html
diff --git a/docshell/test/test_bug413310.html → docshell/test/mochitest/test_bug413310.html b/docshell/test/test_bug413310.html → docshell/test/mochitest/test_bug413310.html
diff --git a/docshell/test/test_bug475636.html → docshell/test/mochitest/test_bug475636.html b/docshell/test/test_bug475636.html → docshell/test/mochitest/test_bug475636.html
diff --git a/docshell/test/test_bug509055.html → docshell/test/mochitest/test_bug509055.html b/docshell/test/test_bug509055.html → docshell/test/mochitest/test_bug509055.html
diff --git a/docshell/test/test_bug511449.html → docshell/test/mochitest/test_bug511449.html b/docshell/test/test_bug511449.html → docshell/test/mochitest/test_bug511449.html
diff --git a/docshell/test/test_bug529119-1.html → ...hell/test/mochitest/test_bug529119-1.html b/docshell/test/test_bug529119-1.html → ...hell/test/mochitest/test_bug529119-1.html
@@ -2,15 +2,15 @@
 <html>
 <head>
 <title>Test bug 529119</title>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
 <script class="testbody" type="text/javascript">
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 
-var workingURL = "http://mochi.test:8888/tests/docshell/test/bug529119-window.html";
+var workingURL = "http://mochi.test:8888/tests/docshell/test/mochitest/bug529119-window.html";
 var faultyURL = "http://some-nonexistent-domain-27489274c892748217cn2384.com/";
 
 var w = null;
@@ -33,7 +33,7 @@
       catch (ex) {
         haveErrorPage = true;
       }
-  
+
       if (iterationsLeft == 0 || haveErrorPage) {
         window.clearInterval(int);
         f(iterationsLeft > 0);
@@ -51,35 +51,35 @@
       window.setTimeout(function() {
         w.location.href = faultyURL;
       }, 0);
-    
+
       phase = 1;
 
       pollForPage(function(succeeded) {
         ok(succeeded, "Waiting for error page succeeded");
-        
-        /* 3. now, while we are on the error page, try to reload it, actually 
+
+        /* 3. now, while we are on the error page, try to reload it, actually
            click the "Try Again" button */
         SpecialPowers.wrap(w).location.reload();
 
         pollForPage(function(succeeded) {
           ok(succeeded, "Waiting for error page succeeded");
-          
+
           /* 4-finish, check we are still on the error page */
           is(SpecialPowers.wrap(w).location.href, faultyURL, "Is on an error page");
           isnot(SpecialPowers.wrap(w).location.href, workingURL, "Is not on the previous page");
-          is(gotWrongPageOnTryAgainClick, false, 
+          is(gotWrongPageOnTryAgainClick, false,
             "Must not get www.example.com page on reload of an error page");
           w.close();
           SimpleTest.finish();
         }, w);
       }, w);
       break;
-      
+
     case 1:
       /* 4-check, we must not get here! */
       gotWrongPageOnTryAgainClick = true;
       break;
-  }             
+  }
 }
 
 function startTest()

diff --git a/docshell/test/test_bug529119-2.html → ...hell/test/mochitest/test_bug529119-2.html b/docshell/test/test_bug529119-2.html → ...hell/test/mochitest/test_bug529119-2.html
@@ -2,15 +2,15 @@
 <html>
 <head>
 <title>Test bug 529119</title>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
 <script class="testbody" type="text/javascript">
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 
-var workingURL = "http://mochi.test:8888/tests/docshell/test/bug529119-window.html";
+var workingURL = "http://mochi.test:8888/tests/docshell/test/mochitest/bug529119-window.html";
 var faultyURL = "http://some-nonexistent-domain-27489274c892748217cn2384.com/";
 
 var w = null;
@@ -25,15 +25,15 @@
     var iterationsLeft = 200;
     var int = window.setInterval(function() {
       iterationsLeft--;
-      
+
       var haveErrorPage = false;
       try {
         var title = w.document.title;
       }
       catch (ex) {
         haveErrorPage = true;
       }
-  
+
       if (iterationsLeft == 0 || expectErrorPage == haveErrorPage) {
         window.clearInterval(int);
         f(iterationsLeft > 0);
@@ -51,7 +51,7 @@
   isWindowLoaded = true;
 
   /* 2. We have successfully loaded a page, now go to a faulty URL */
-  // XXX The test fails when we change the location synchronously 
+  // XXX The test fails when we change the location synchronously
   window.setTimeout(function() {
     w.location.href = faultyURL;
   }, 0);

diff --git a/docshell/test/test_bug530396.html → docshell/test/mochitest/test_bug530396.html b/docshell/test/test_bug530396.html → docshell/test/mochitest/test_bug530396.html
@@ -14,7 +14,7 @@
 
 <p>
 
-<iframe id="testFrame" src="http://mochi.test:8888/tests/docshell/test/bug530396-subframe.html"></iframe>
+<iframe id="testFrame" src="http://mochi.test:8888/tests/docshell/test/mochitest/bug530396-subframe.html"></iframe>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">

diff --git a/docshell/test/test_bug540462.html → docshell/test/mochitest/test_bug540462.html b/docshell/test/test_bug540462.html → docshell/test/mochitest/test_bug540462.html
diff --git a/docshell/test/test_bug551225.html → docshell/test/mochitest/test_bug551225.html b/docshell/test/test_bug551225.html → docshell/test/mochitest/test_bug551225.html
diff --git a/docshell/test/test_bug570341.html → docshell/test/mochitest/test_bug570341.html b/docshell/test/test_bug570341.html → docshell/test/mochitest/test_bug570341.html
diff --git a/docshell/test/test_bug580069.html → docshell/test/mochitest/test_bug580069.html b/docshell/test/test_bug580069.html → docshell/test/mochitest/test_bug580069.html
diff --git a/docshell/test/test_bug590573.html → docshell/test/mochitest/test_bug590573.html b/docshell/test/test_bug590573.html → docshell/test/mochitest/test_bug590573.html
diff --git a/docshell/test/test_bug598895.html → docshell/test/mochitest/test_bug598895.html b/docshell/test/test_bug598895.html → docshell/test/mochitest/test_bug598895.html
diff --git a/docshell/test/test_bug634834.html → docshell/test/mochitest/test_bug634834.html b/docshell/test/test_bug634834.html → docshell/test/mochitest/test_bug634834.html
diff --git a/docshell/test/test_bug637644.html → docshell/test/mochitest/test_bug637644.html b/docshell/test/test_bug637644.html → docshell/test/mochitest/test_bug637644.html
diff --git a/docshell/test/test_bug640387_1.html → ...hell/test/mochitest/test_bug640387_1.html b/docshell/test/test_bug640387_1.html → ...hell/test/mochitest/test_bug640387_1.html
diff --git a/docshell/test/test_bug640387_2.html → ...hell/test/mochitest/test_bug640387_2.html b/docshell/test/test_bug640387_2.html → ...hell/test/mochitest/test_bug640387_2.html
diff --git a/docshell/test/test_bug653741.html → docshell/test/mochitest/test_bug653741.html b/docshell/test/test_bug653741.html → docshell/test/mochitest/test_bug653741.html
diff --git a/docshell/test/test_bug660404.html → docshell/test/mochitest/test_bug660404.html b/docshell/test/test_bug660404.html → docshell/test/mochitest/test_bug660404.html
diff --git a/docshell/test/test_bug662170.html → docshell/test/mochitest/test_bug662170.html b/docshell/test/test_bug662170.html → docshell/test/mochitest/test_bug662170.html
diff --git a/docshell/test/test_bug668513.html → docshell/test/mochitest/test_bug668513.html b/docshell/test/test_bug668513.html → docshell/test/mochitest/test_bug668513.html
diff --git a/docshell/test/test_bug669671.html → docshell/test/mochitest/test_bug669671.html b/docshell/test/test_bug669671.html → docshell/test/mochitest/test_bug669671.html
diff --git a/docshell/test/test_bug675587.html → docshell/test/mochitest/test_bug675587.html b/docshell/test/test_bug675587.html → docshell/test/mochitest/test_bug675587.html
diff --git a/docshell/test/test_bug680257.html → docshell/test/mochitest/test_bug680257.html b/docshell/test/test_bug680257.html → docshell/test/mochitest/test_bug680257.html
diff --git a/docshell/test/test_bug691547.html → docshell/test/mochitest/test_bug691547.html b/docshell/test/test_bug691547.html → docshell/test/mochitest/test_bug691547.html
diff --git a/docshell/test/test_bug694612.html → docshell/test/mochitest/test_bug694612.html b/docshell/test/test_bug694612.html → docshell/test/mochitest/test_bug694612.html
diff --git a/docshell/test/test_bug703855.html → docshell/test/mochitest/test_bug703855.html b/docshell/test/test_bug703855.html → docshell/test/mochitest/test_bug703855.html
diff --git a/docshell/test/test_bug728939.html → docshell/test/mochitest/test_bug728939.html b/docshell/test/test_bug728939.html → docshell/test/mochitest/test_bug728939.html
diff --git a/docshell/test/test_bug797909.html → docshell/test/mochitest/test_bug797909.html b/docshell/test/test_bug797909.html → docshell/test/mochitest/test_bug797909.html
diff --git a/...est_close_onpagehide_by_history_back.html → ...est_close_onpagehide_by_history_back.html b/...est_close_onpagehide_by_history_back.html → ...est_close_onpagehide_by_history_back.html
diff --git a/...est_close_onpagehide_by_window_close.html → ...est_close_onpagehide_by_window_close.html b/...est_close_onpagehide_by_window_close.html → ...est_close_onpagehide_by_window_close.html
diff --git a/...forceinheritprincipal_overrule_owner.html → ...forceinheritprincipal_overrule_owner.html b/...forceinheritprincipal_overrule_owner.html → ...forceinheritprincipal_overrule_owner.html
diff --git a/docshell/test/test_framedhistoryframes.html → ...t/mochitest/test_framedhistoryframes.html b/docshell/test/test_framedhistoryframes.html → ...t/mochitest/test_framedhistoryframes.html
diff --git a/...t/test_pushState_after_document_open.html → ...t/test_pushState_after_document_open.html b/...t/test_pushState_after_document_open.html → ...t/test_pushState_after_document_open.html
@@ -15,10 +15,12 @@
   // Child needs to invoke us, otherwise our onload will fire before the child
   // has done the write/close bit.
   onmessage = function doTest() {
-    is(frames[0].location.pathname, "/tests/docshell/test/file_pushState_after_document_open.html", "Should have the right path here");
+    is(frames[0].location.pathname, "/tests/docshell/test/mochitest/file_pushState_after_document_open.html",
+       "Should have the right path here");
     is(frames[0].location.hash, "", "Should have the right hash here");
     frames[0].history.pushState({}, '', frames[0].document.URL + "#foopy");
-    is(frames[0].location.pathname, "/tests/docshell/test/file_pushState_after_document_open.html", "Pathname should not have changed");
+    is(frames[0].location.pathname, "/tests/docshell/test/mochitest/file_pushState_after_document_open.html",
+       "Pathname should not have changed");
     is(frames[0].location.hash, "#foopy", "Hash should have changed");
     SimpleTest.finish();
   }

diff --git a/..._triggeringprincipal_location_seturi.html → ..._triggeringprincipal_location_seturi.html b/..._triggeringprincipal_location_seturi.html → ..._triggeringprincipal_location_seturi.html
diff --git a/...hell/test/test_windowedhistoryframes.html → ...mochitest/test_windowedhistoryframes.html b/...hell/test/test_windowedhistoryframes.html → ...mochitest/test_windowedhistoryframes.html
diff --git a/docshell/test/url1_historyframe.html → ...ell/test/mochitest/url1_historyframe.html b/docshell/test/url1_historyframe.html → ...ell/test/mochitest/url1_historyframe.html
diff --git a/docshell/test/url2_historyframe.html → ...ell/test/mochitest/url2_historyframe.html b/docshell/test/url2_historyframe.html → ...ell/test/mochitest/url2_historyframe.html
diff --git a/docshell/test/moz.build b/docshell/test/moz.build
@@ -69,6 +69,46 @@ with Files('iframesandbox/*marquee_event_handlers*'):
     BUG_COMPONENT = ('Core', 'DOM: Security')
 
 
+with Files('mochitest/*1045096*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*1151421*'):
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
+
+with Files('mochitest/*402210*'):
+    BUG_COMPONENT = ('Core', 'DOM: Security')
+
+with Files('mochitest/*509055*'):
+    BUG_COMPONENT = ('Core', 'History: Global')
+
+with Files('mochitest/*511449*'):
+    BUG_COMPONENT = ('Core', 'Widget: Cocoa')
+
+with Files('mochitest/*551225*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*570341*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*580069*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*637644*'):
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
+
+with Files('mochitest/*640387*'):
+    BUG_COMPONENT = ('Core', 'DOM: Events')
+
+with Files('mochitest/*668513*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*797909*'):
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
+
+with Files('mochitest/*forceinheritprincipal*'):
+    BUG_COMPONENT = ('Core', 'DOM: Security')
+
+
 with Files('navigation/*13871.html'):
     BUG_COMPONENT = ('Core', 'Security')
 
@@ -99,42 +139,3 @@ with Files('unit/*442584*'):
 
 with Files('unit/*setUsePrivateBrowsing*'):
     BUG_COMPONENT = ('Firefox', 'Extension Compatibility')
-
-with Files('*1045096*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*1151421*'):
-    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
-
-with Files('*402210*'):
-    BUG_COMPONENT = ('Core', 'DOM: Security')
-
-with Files('*509055*'):
-    BUG_COMPONENT = ('Core', 'History: Global')
-
-with Files('*511449*'):
-    BUG_COMPONENT = ('Core', 'Widget: Cocoa')
-
-with Files('*551225*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*570341*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*580069*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*637644*'):
-    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
-
-with Files('*640387*'):
-    BUG_COMPONENT = ('Core', 'DOM: Events')
-
-with Files('*668513*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*797909*'):
-    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
-
-with Files('*forceinheritprincipal*'):
-    BUG_COMPONENT = ('Core', 'DOM: Security')