Backed out changeset a7d5ea538c57 (bug 806736) for test failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 18 Dec 2012 18:27:36 -0500
changeset 125564 b3d7e749388b30ae5765e62ae7393c6efd87e086
parent 125563 03b9ac3761463acbd5780afcf250de51520ea884
child 125565 96de6d7f081394255c89dcd7339920cb0620c55b
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs806736
milestone20.0a1
backs outa7d5ea538c57f4148ded6a1e8c2e3a21b57cb3c0
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
Backed out changeset a7d5ea538c57 (bug 806736) for test failures.
toolkit/components/passwordmgr/test/Makefile.in
toolkit/components/passwordmgr/test/privbrowsing_perwindowpb_iframe.html
toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ b/toolkit/components/passwordmgr/test/Makefile.in
@@ -87,21 +87,15 @@ MOCHITEST_FILES += \
     test_privbrowsing.html \
     $(NULL)
 
 ifneq ($(OS_TARGET),Linux)
 MOCHITEST_FILES += \
     test_prompt.html \
     $(NULL)
 endif
-
-else
-MOCHITEST_FILES += \
-    privbrowsing_perwindowpb_iframe.html \
-    test_privbrowsing_perwindowpb.html \
-    $(NULL)
 endif
 
 # This test doesn't pass because we can't ensure a cross-platform
 # event that occurs between DOMContentLoaded and Pageload
 # test_bug_221634.html
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/passwordmgr/test/privbrowsing_perwindowpb_iframe.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-<iframe id="iframe"></iframe>
-</body>
-</html>
deleted file mode 100644
--- a/toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html
+++ /dev/null
@@ -1,294 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=248970
--->
-<head>
-  <title>Test for Bug 248970</title>
-  <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="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=248970">Mozilla Bug 248970</a>
-<p id="display"></p>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** 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 = document.location.pathname + "/../";
-var prefix = "http://test2.example.com" + testpath;
-var subtests = [
-                   "subtst_privbrowsing_1.html", // 1
-                   "subtst_privbrowsing_1.html", // 2
-                   "subtst_privbrowsing_1.html", // 3
-                   "subtst_privbrowsing_2.html", // 4
-                   "subtst_privbrowsing_2.html", // 5
-                   "subtst_privbrowsing_2.html", // 6
-                   "subtst_privbrowsing_3.html", // 7
-                   "subtst_privbrowsing_3.html", // 8
-                   "subtst_privbrowsing_4.html", // 9
-                   "subtst_privbrowsing_3.html" // 10
-               ];
-
-var testNum = 0;
-function loadNextTest() {
-  // run the initialization code for each test
-  switch (++ testNum) {
-    case 1:
-      popupNotifications = normalWindowPopupNotifications;
-      iframe = normalWindowIframe;
-      break;
-
-    case 2:
-      popupNotifications = privateWindowPopupNotifications;
-      iframe = privateWindowIframe;
-      break;
-
-    case 3:
-      popupNotifications = normalWindowPopupNotifications;
-      iframe = normalWindowIframe;
-      break;
-
-    case 4:
-      pwmgr.addLogin(login);
-      break;
-
-    case 5:
-      popupNotifications = privateWindowPopupNotifications;
-      iframe = privateWindowIframe;
-      break;
-
-    case 6:
-      popupNotifications = normalWindowPopupNotifications;
-      iframe = normalWindowIframe;
-      break;
-
-    case 7:
-      pwmgr.addLogin(login);
-      break;
-
-    case 8:
-      popupNotifications = privateWindowPopupNotifications;
-      iframe = privateWindowIframe;
-      break;
-
-    case 9:
-      break;
-
-    case 10:
-      popupNotifications = normalWindowPopupNotifications;
-      iframe = normalWindowIframe;
-      break;
-
-    default:
-      ok(false, "Unexpected call to loadNextTest for test #" + testNum);
-  }
-
-  ok(true, "Starting test #" + testNum);
-  iframe.src = prefix + subtests[testNum-1];
-}
-
-
-function checkTest() {
-  var popup;
-
-  switch (testNum) {
-    case 1:
-      // run outside of private mode, popup notification should appear
-      popup = getPopup(popupNotifications, "password-save");
-      ok(popup, "got popup notification");
-      popup.remove();
-      break;
-
-    case 2:
-      // run inside of private mode, popup notification should not appear
-      popup = getPopup(popupNotifications, "password-save");
-      ok(!popup, "checking for no popup notification");
-      break;
-
-    case 3:
-      // run outside of private mode, popup notification should appear
-      popup = getPopup(popupNotifications, "password-save");
-      ok(popup, "got popup notification");
-      popup.remove();
-      break;
-
-    case 4:
-      // run outside of private mode, popup notification should appear
-      popup = getPopup(popupNotifications, "password-change");
-      ok(popup, "got popup notification");
-      popup.remove();
-      break;
-
-    case 5:
-      // run inside of private mode, popup notification should not appear
-      popup = getPopup(popupNotifications, "password-change");
-      ok(!popup, "checking for no popup notification");
-      break;
-
-    case 6:
-      // run outside of private mode, popup notification should appear
-      popup = getPopup(popupNotifications, "password-change");
-      ok(popup, "got popup notification");
-      popup.remove();
-      pwmgr.removeLogin(login);
-      break;
-
-    case 7:
-      // verify that the user/pass pair was autofilled
-      var gotUser = iframe.contentDocument.getElementById("user").textContent;
-      var gotPass = iframe.contentDocument.getElementById("pass").textContent;
-      is(gotUser, "notifyu1", "Checking submitted username");
-      is(gotPass, "notifyp1", "Checking submitted password");
-      break;
-
-    case 8:
-      // verify that the user/pass pair was not autofilled
-      var gotUser = iframe.contentDocument.getElementById("user").textContent;
-      var gotPass = iframe.contentDocument.getElementById("pass").textContent;
-      is(gotUser, "", "Checking submitted username");
-      is(gotPass, "", "Checking submitted password");
-      break;
-
-    case 9:
-      // verify that the user/pass pair was available for autocomplete
-      var gotUser = iframe.contentDocument.getElementById("user").textContent;
-      var gotPass = iframe.contentDocument.getElementById("pass").textContent;
-      is(gotUser, "notifyu1", "Checking submitted username");
-      is(gotPass, "notifyp1", "Checking submitted password");
-      break;
-
-    case 10:
-      // verify that the user/pass pair was autofilled
-      var gotUser = iframe.contentDocument.getElementById("user").textContent;
-      var gotPass = iframe.contentDocument.getElementById("pass").textContent;
-      is(gotUser, "notifyu1", "Checking submitted username");
-      is(gotPass, "notifyp1", "Checking submitted password");
-      pwmgr.removeLogin(login);
-      break;
-
-    default:
-      ok(false, "Unexpected call to checkTest for test #" + testNum);
-
-  }
-}
-
-var mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
-                    .getInterface(Ci.nsIWebNavigation)
-                    .QueryInterface(Ci.nsIDocShellTreeItem)
-                    .rootTreeItem
-                    .QueryInterface(Ci.nsIInterfaceRequestor)
-                    .getInterface(Ci.nsIDOMWindow);
-var contentPage = "http://mochi.test:8888/tests/toolkit/components/passwordmgr/test/privbrowsing_perwindowpb_iframe.html";
-function testOnWindow(aIsPrivate, aCallback) {
-  var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});
-  win.addEventListener("load", function onLoad() {
-    win.removeEventListener("load", onLoad, false);
-    win.addEventListener("DOMContentLoaded", function onInnerLoad() {
-      if (win.content.location.href == "about:privatebrowsing") {
-        win.gBrowser.loadURI(contentPage);
-        return;
-      }
-      win.removeEventListener("DOMContentLoaded", onInnerLoad, true);
-      win.gBrowser.selectedBrowser.focus();
-      SimpleTest.executeSoon(function() { aCallback(win); });
-    }, true);
-    SimpleTest.executeSoon(function() { win.gBrowser.loadURI(contentPage); });
-  }, true);
-}
-
-var ignoreLoad = false;
-function handleLoad(aEvent) {
-  // ignore every other load event ... We get one for loading the subtest (which
-  // we want to ignore), and another when the subtest's form submits itself
-  // (which we want to handle, to start the next test).
-  ignoreLoad = !ignoreLoad;
-  if (ignoreLoad) {
-    ok(true, "Ignoring load of subtest #" + testNum);
-    return;
-  }
-  ok(true, "Processing submission of subtest #" + testNum);
-
-  checkTest();
-
-  if (testNum < subtests.length) {
-    loadNextTest();
-  } else {
-    ok(true, "private browsing notification tests finished.");
-
-    normalWindow.close();
-    privateWindow.close();
-
-    SimpleTest.finish();
-  }
-}
-
-var pwmgr = Cc["@mozilla.org/login-manager;1"].
-            getService(Ci.nsILoginManager);
-ok(pwmgr != null, "Access pwmgr");
-
-// We need to make sure no logins have been stored by previous tests
-// for forms in |url|, otherwise the change password notification
-// would turn into a prompt, and the test will fail.
-var url = "http://test2.example.com";
-is(pwmgr.countLogins(url, "", null), 0, "No logins should be stored for " + url);
-
-var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
-                                             Ci.nsILoginInfo, "init");
-var login = new nsLoginInfo(url, url, null, "notifyu1", "notifyp1", "user", "pass");
-
-var normalWindow;
-var privateWindow;
-
-var iframe;
-var normalWindowIframe;
-var privateWindowIframe;
-
-var popupNotifications;
-var normalWindowPopupNotifications;
-var privateWindowPopupNotifications;
-
-testOnWindow(false, function(aWin) {
-  var selectedBrowser = aWin.gBrowser.selectedBrowser;
-
-  normalWindow = aWin;
-
-  normalWindowIframe = selectedBrowser.contentDocument.getElementById("iframe");
-  normalWindowIframe.onload = handleLoad;
-
-  // popupNotifications (not *popup*) is a constant, per-tab container. So, we
-  // only need to fetch it once.
-  normalWindowPopupNotifications = getPopupNotifications(selectedBrowser.contentWindow.top);
-  ok(normalWindowPopupNotifications, "Got popupNotifications in normal window");
-
-  testOnWindow(true, function(aPrivateWin) {
-    var selectedBrowser = aPrivateWin.gBrowser.selectedBrowser;
-
-    privateWindow = aPrivateWin;
-
-    privateWindowIframe = selectedBrowser.contentDocument.getElementById("iframe");
-    privateWindowIframe.onload = handleLoad;
-
-    // popupNotifications (not *popup*) is a constant, per-tab container. So, we
-    // only need to fetch it once.
-    privateWindowPopupNotifications = getPopupNotifications(selectedBrowser.contentWindow.top);
-    ok(privateWindowPopupNotifications, "Got popupNotifications in private window");
-
-    loadNextTest();
-  });
-});
-
-SimpleTest.waitForExplicitFinish();
-</script>
-</pre>
-</body>
-</html>
-