| ☠☠ backed out by 88315c6735de ☠ ☠ | |
| author | Mark Banner <standard8@mozilla.com> |
| Mon, 01 Oct 2018 19:10:05 +0000 | |
| changeset 439087 | d0d9cd85f3dba3ba7bd08dc54e2279fae2316570 |
| parent 439086 | ddaef0a8de5f670fcfac3fe8c9ea1a045c031226 |
| child 439088 | 44d07650e6fe1671353c27d2b84df40c36883ab2 |
| push id | 108500 |
| push user | cbrindusan@mozilla.com |
| push date | Tue, 02 Oct 2018 04:06:35 +0000 |
| treeherder | mozilla-inbound@58adc643dcdc [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | qdot |
| bugs | 1417383 |
| milestone | 64.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
|
--- a/docshell/moz.build +++ b/docshell/moz.build @@ -16,17 +16,17 @@ DIRS += [ XPCSHELL_TESTS_MANIFESTS += [ 'test/unit/xpcshell.ini', 'test/unit_ipc/xpcshell.ini', ] MOCHITEST_MANIFESTS += [ 'test/iframesandbox/mochitest.ini', - 'test/mochitest.ini', + 'test/mochitest/mochitest.ini', 'test/navigation/mochitest.ini', ] MOCHITEST_CHROME_MANIFESTS += [ 'test/chrome/chrome.ini', ] BROWSER_CHROME_MANIFESTS += [
deleted file mode 100644 --- a/docshell/test/file_bug637644_1.html +++ /dev/null @@ -1,1 +0,0 @@ -<script>window.onload = function() { opener.postMessage('loaded', '*'); }</script><body>Should show</body>
deleted file mode 100644 --- a/docshell/test/file_bug637644_2.html +++ /dev/null @@ -1,1 +0,0 @@ -<script>window.onload = function() { opener.postMessage('loaded', '*'); }</script><body></body>
deleted file mode 100644 --- a/docshell/test/file_bug662170.html +++ /dev/null @@ -1,13 +0,0 @@ -<html> -<body onload='(parent || opener).childLoad()'> - -<div style='height:500px; background:yellow'> -<a id='#top'>Top of the page</a> -</div> - -<div id='bottom'> -<a id='#bottom'>Bottom of the page</a> -</div> - -</body> -</html>
rename from docshell/test/bug123696-subframe.html rename to docshell/test/mochitest/bug123696-subframe.html
rename from docshell/test/bug404548-subframe.html rename to docshell/test/mochitest/bug404548-subframe.html
rename from docshell/test/bug404548-subframe_window.html rename to docshell/test/mochitest/bug404548-subframe_window.html
rename from docshell/test/bug413310-subframe.html rename to docshell/test/mochitest/bug413310-subframe.html
rename from docshell/test/bug529119-window.html rename to docshell/test/mochitest/bug529119-window.html
rename from docshell/test/bug530396-subframe.html rename to docshell/test/mochitest/bug530396-subframe.html
rename from docshell/test/bug570341_recordevents.html rename to docshell/test/mochitest/bug570341_recordevents.html
rename from docshell/test/bug668513_redirect.html rename to docshell/test/mochitest/bug668513_redirect.html
rename from docshell/test/bug668513_redirect.html^headers^ rename to docshell/test/mochitest/bug668513_redirect.html^headers^
rename from docshell/test/bug691547_frame.html rename to docshell/test/mochitest/bug691547_frame.html
rename from docshell/test/file_anchor_scroll_after_document_open.html rename to docshell/test/mochitest/file_anchor_scroll_after_document_open.html
rename from docshell/test/file_bfcache_plus_hash_1.html rename to docshell/test/mochitest/file_bfcache_plus_hash_1.html
rename from docshell/test/file_bfcache_plus_hash_2.html rename to docshell/test/mochitest/file_bfcache_plus_hash_2.html
rename from docshell/test/file_bug1121701_1.html rename to docshell/test/mochitest/file_bug1121701_1.html
rename from docshell/test/file_bug1121701_2.html rename to docshell/test/mochitest/file_bug1121701_2.html
rename from docshell/test/file_bug1151421.html rename to docshell/test/mochitest/file_bug1151421.html
rename from docshell/test/file_bug1186774.html rename to docshell/test/mochitest/file_bug1186774.html
rename from docshell/test/file_bug1450164.html rename to docshell/test/mochitest/file_bug1450164.html
rename from docshell/test/file_bug385434_1.html rename to docshell/test/mochitest/file_bug385434_1.html
rename from docshell/test/file_bug385434_2.html rename to docshell/test/mochitest/file_bug385434_2.html
rename from docshell/test/file_bug385434_3.html rename to docshell/test/mochitest/file_bug385434_3.html
rename from docshell/test/file_bug580069_1.html rename to docshell/test/mochitest/file_bug580069_1.html
rename from docshell/test/file_bug580069_2.sjs rename to docshell/test/mochitest/file_bug580069_2.sjs
rename from docshell/test/file_bug590573_1.html rename to docshell/test/mochitest/file_bug590573_1.html
rename from docshell/test/file_bug590573_2.html rename to docshell/test/mochitest/file_bug590573_2.html
rename from docshell/test/file_bug598895_1.html rename to docshell/test/mochitest/file_bug598895_1.html
rename from docshell/test/file_bug598895_2.html rename to docshell/test/mochitest/file_bug598895_2.html
rename from docshell/test/file_bug660404-1.html rename to docshell/test/mochitest/file_bug660404-1.html
rename from docshell/test/file_bug660404^headers^ rename to docshell/test/mochitest/file_bug660404^headers^
rename from docshell/test/file_close_onpagehide1.html rename to docshell/test/mochitest/file_close_onpagehide1.html
rename from docshell/test/file_close_onpagehide2.html rename to docshell/test/mochitest/file_close_onpagehide2.html
rename from docshell/test/file_framedhistoryframes.html rename to docshell/test/mochitest/file_framedhistoryframes.html
rename from docshell/test/file_pushState_after_document_open.html rename to docshell/test/mochitest/file_pushState_after_document_open.html
rename from docshell/test/historyframes.html rename to docshell/test/mochitest/historyframes.html --- a/docshell/test/historyframes.html +++ b/docshell/test/mochitest/historyframes.html @@ -45,17 +45,17 @@ function loadContent(aURL, aCallback) { function getURL() { return gFrame.contentDocument.documentURI; } function getContent() { 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"; function run_test() { window.location.hash = "START"; gFrame = document.getElementById("iframe");
rename from docshell/test/start_historyframe.html rename to docshell/test/mochitest/start_historyframe.html
rename from docshell/test/test_anchor_scroll_after_document_open.html rename to docshell/test/mochitest/test_anchor_scroll_after_document_open.html
rename from docshell/test/test_bfcache_plus_hash.html rename to docshell/test/mochitest/test_bfcache_plus_hash.html
rename from docshell/test/test_bug1045096.html rename to docshell/test/mochitest/test_bug1045096.html
rename from docshell/test/test_bug1121701.html rename to docshell/test/mochitest/test_bug1121701.html
rename from docshell/test/test_bug1151421.html rename to docshell/test/mochitest/test_bug1151421.html
rename from docshell/test/test_bug1186774.html rename to docshell/test/mochitest/test_bug1186774.html
rename from docshell/test/test_bug1450164.html rename to docshell/test/mochitest/test_bug1450164.html
rename from docshell/test/test_bug529119-1.html rename to docshell/test/mochitest/test_bug529119-1.html --- a/docshell/test/test_bug529119-1.html +++ b/docshell/test/mochitest/test_bug529119-1.html @@ -1,21 +1,21 @@ <!DOCTYPE HTML> <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; var phase = 0; var gotWrongPageOnTryAgainClick = false; function pollForPage(f, w) { @@ -28,17 +28,17 @@ function pollForPage(f, w) var haveErrorPage = false; try { var title = w.document.title; } catch (ex) { haveErrorPage = true; } - + if (iterationsLeft == 0 || haveErrorPage) { window.clearInterval(int); f(iterationsLeft > 0); } }, 100); }, 1000); } @@ -46,45 +46,45 @@ function windowLoaded() { switch (phase) { case 0: /* 2. We have succeededfully loaded a page, now go to a faulty URL */ 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() { /* 1. load a URL that leads to an error page */ w = window.open(workingURL); }
rename from docshell/test/test_bug529119-2.html rename to docshell/test/mochitest/test_bug529119-2.html --- a/docshell/test/test_bug529119-2.html +++ b/docshell/test/mochitest/test_bug529119-2.html @@ -1,44 +1,44 @@ <!DOCTYPE HTML> <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; var phase = 0; var isWindowLoaded = false; function pollForPage(expectErrorPage, f, w) { // Start with polling after a delay, we might mistakenly take the current page // as an expected one. window.setTimeout(function() { 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); } }, 100); }, 1000); } @@ -46,17 +46,17 @@ function windowLoaded() { // The code under here should only be run once // The test popup window workingURL was already opened if (isWindowLoaded) return; 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); pollForPage(true, function(succeeded) { ok(succeeded, "Waiting for error page succeeded"); /* 3. now, while we are on the error page, navigate back */ try {
rename from docshell/test/test_bug530396.html rename to docshell/test/mochitest/test_bug530396.html --- a/docshell/test/test_bug530396.html +++ b/docshell/test/mochitest/test_bug530396.html @@ -9,17 +9,17 @@ https://bugzilla.mozilla.org/show_bug.cg <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> </head> <body> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=530396">Mozilla Bug 530396</a> <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"> // NOTE: If we ever make subframes do bfcache stuff, this test will need to be // modified accordingly! It assumes that subframes do NOT get bfcached. var onloadCount = 0;
rename from docshell/test/test_bug640387_1.html rename to docshell/test/mochitest/test_bug640387_1.html
rename from docshell/test/test_bug640387_2.html rename to docshell/test/mochitest/test_bug640387_2.html
rename from docshell/test/test_close_onpagehide_by_history_back.html rename to docshell/test/mochitest/test_close_onpagehide_by_history_back.html
rename from docshell/test/test_close_onpagehide_by_window_close.html rename to docshell/test/mochitest/test_close_onpagehide_by_window_close.html
rename from docshell/test/test_forceinheritprincipal_overrule_owner.html rename to docshell/test/mochitest/test_forceinheritprincipal_overrule_owner.html
rename from docshell/test/test_framedhistoryframes.html rename to docshell/test/mochitest/test_framedhistoryframes.html
rename from docshell/test/test_pushState_after_document_open.html rename to docshell/test/mochitest/test_pushState_after_document_open.html --- a/docshell/test/test_pushState_after_document_open.html +++ b/docshell/test/mochitest/test_pushState_after_document_open.html @@ -10,20 +10,22 @@ https://bugzilla.mozilla.org/show_bug.cg <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> <script type="application/javascript"> /** Test for Bug 957479 **/ SimpleTest.waitForExplicitFinish(); // 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(); } </script> </head> <body> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=957479">Mozilla Bug 957479</a>
rename from docshell/test/test_triggeringprincipal_location_seturi.html rename to docshell/test/mochitest/test_triggeringprincipal_location_seturi.html
rename from docshell/test/test_windowedhistoryframes.html rename to docshell/test/mochitest/test_windowedhistoryframes.html