Backed out changesets 917205c79822 and e9ef1f1aa47d (bug 841413) for causing mochitest-chrome failure.

Failure is:
ERROR TEST-UNEXPECTED-FAIL | chrome://mochitests/content/chrome/toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html | uncaught exception - TypeError: normalWindowIframe is null at chrome://mochitests/content/chrome/toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html:266
This commit is contained in:
L. David Baron 2013-02-23 00:39:54 -08:00
Родитель 173d8cebca
Коммит 44d4350e86
4 изменённых файлов: 15 добавлений и 17 удалений

Просмотреть файл

@ -16,6 +16,7 @@ prefBranch.setIntPref("browser.startup.page", 0);
prefBranch.setCharPref("browser.startup.homepage_override.mstone", "ignore");
function startTest() {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShellTreeItem)

Просмотреть файл

@ -8,6 +8,8 @@
<script type="text/javascript">
SimpleTest.waitForExplicitFinish();
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
Components.utils.import("resource://gre/modules/Services.jsm");
const Ci = Components.interfaces;
@ -48,6 +50,8 @@ function startTest() {
}
function doNextTest(aWindow) {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
info("Running test: " + currentTest);
switch (currentTest) {
// Initialy setup the quota to testing value of 1024B and

Просмотреть файл

@ -53,6 +53,8 @@ MOCHITEST_FILES = \
test_maxforms_3.html \
test_notifications.html \
test_notifications_popup.html \
privbrowsing_perwindowpb_iframe.html \
test_privbrowsing_perwindowpb.html \
test_prompt_async.html \
test_xhr.html \
test_xml_load.html \
@ -62,6 +64,10 @@ MOCHITEST_FILES = \
notification_common.js \
authenticate.sjs \
formsubmit.sjs \
subtst_privbrowsing_1.html \
subtst_privbrowsing_2.html \
subtst_privbrowsing_3.html \
subtst_privbrowsing_4.html \
subtst_master_pass.html \
subtst_notifications_1.html \
subtst_notifications_2.html \
@ -84,18 +90,6 @@ MOCHITEST_FILES += \
$(NULL)
endif
MOCHITEST_CHROME_FILES += \
privbrowsing_perwindowpb_iframe.html \
test_privbrowsing_perwindowpb.html \
subtst_privbrowsing_1.html \
subtst_privbrowsing_2.html \
subtst_privbrowsing_3.html \
subtst_privbrowsing_4.html \
notification_common.js \
pwmgr_common.js \
formsubmit.sjs \
$(NULL)
# This test doesn't pass because we can't ensure a cross-platform
# event that occurs between DOMContentLoaded and Pageload
# test_bug_221634.html

Просмотреть файл

@ -5,11 +5,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=248970
-->
<head>
<title>Test for Bug 248970</title>
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="notification_common.js"></script>
<link rel="stylesheet" type="text/css"
href="chrome://mochikit/content/tests/SimpleTest/test.css">
<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=248970">Mozilla Bug 248970</a>
@ -20,11 +18,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=248970
/** Test for Bug 248970 **/
// based on test_notifications.html
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
const Ci = Components.interfaces;
const Cc = Components.classes;
const Cr = Components.results;
var testpath = "/tests/toolkit/components/passwordmgr/test/";
var testpath = document.location.pathname + "/../";
var prefix = "http://test2.example.com" + testpath;
var subtests = [
"subtst_privbrowsing_1.html", // 1