Back out changeset 1328faef900b / bug 527550 due to test failures.
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 30 Sep 2010 12:20:37 +0100
changeset 6458 addb24b470d63d75c53ad362bfea2669e0fd81f1
parent 6457 098388acf16b06ff5fa8d31a95f49365e8b9466f
child 6459 24dafd19672cfcde926ed7c83fc51827113efddf
push id4988
push userbugzilla@standard8.plus.com
push dateThu, 30 Sep 2010 11:21:06 +0000
treeherdercomm-central@addb24b470d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs527550
backs out1328faef900b3c236be8694abf763799783531de
Back out changeset 1328faef900b / bug 527550 due to test failures.
mail/test/mozmill/message-header/test-message-header.js
mail/test/mozmill/runtest.py
mailnews/test/performance/bloat/mailnewsTestPrefs.js
--- a/mail/test/mozmill/message-header/test-message-header.js
+++ b/mail/test/mozmill/message-header/test-message-header.js
@@ -57,31 +57,25 @@ function setupModule(module) {
   wh.installInto(module);
   let abh = collector.getModule('address-book-helpers');
   abh.installInto(module);
 
   folder = create_folder("MessageWindowA");
 
   // create a message that has the interesting headers that commonly
   // show up in the message header pane for testing
-  let msg = create_message({cc: msgGen.makeNamesAndAddresses(20), // YYY
-                            subject: "This is a really, really, really, really, really, really, really, really, long subject.",
+  let msg = create_message({cc: [["John Doe", "john.doe@momo.invalid"]],
                             clobberHeaders: {
                               "Newsgroups": "alt.test",
                               "Reply-To": "J. Doe <j.doe@momo.invalid>",
                               "Content-Base": "http://example.com/",
                               "Bcc": "Richard Roe <richard.roe@momo.invalid>"
                             }});
 
   add_message_to_folder(folder, msg);
-
-  // create a message that has boring headers to be able to switch to and
-  // back from, to force the more button to collapse again.
-  msg = create_message();
-  add_message_to_folder(folder, msg);
 }
 
 function test_add_tag_with_really_long_label() {
   be_in_folder(folder);
 
   // select the first message, which will display it
   let curMessage = select_click_row(0);
 
@@ -127,56 +121,16 @@ function test_add_tag_with_really_long_l
 
   // Remove the tag and put it back so that the a11y label gets regenerated
   // with the normal value rather than "taaaaaaaags"
   tagsLabel.value = oldTagsValue;
   mc.keypress(mc.eid("expandedHeadersNameColumn"), "1", {});
   mc.keypress(mc.eid("expandedHeadersNameColumn"), "1", {});
 }
 
-function test_more_button_with_many_recipients()
-{
-  // Start on the interesting message.
-  let curMessage = select_click_row(0);
-
-  // make sure it loads
-  wait_for_message_display_completion(mc);
-  assert_selected_and_displayed(mc, curMessage);
-
-  // Check the mode of the header.
-  let headerBox = mc.eid("expandedHeaderView");
-  let previousHeaderMode = headerBox.node.getAttribute("show_header_mode");
-
-  // Click the "more" button.
-  let moreIndicator = mc.eid("expandedccBox");
-  moreIndicator = mc.window.document.getAnonymousElementByAttribute(
-                    moreIndicator.node, "anonid", "more");
-  moreIndicator = new elementslib.Elem(moreIndicator);
-  mc.click(moreIndicator);
-
-  // Check the new mode of the header.
-  if (headerBox.node.getAttribute("show_header_mode") != "all")
-    throw new Error("Header Mode didn't change to 'all'!  " + "old=" +
-                    previousHeaderMode + ", new=" +
-                    headerBox.node.getAttribute("show_header_mode"));
-
-  // Switch to the boring message, to force the more button to collapse.
-  let curMessage = select_click_row(1);
-
-  // make sure it loads
-  wait_for_message_display_completion(mc);
-  assert_selected_and_displayed(mc, curMessage);
-
-  // Check the even newer mode of the header.
-  if (headerBox.node.getAttribute("show_header_mode") != previousHeaderMode)
-    throw new Error("Header Mode changed from " + previousHeaderMode +
-                    " to " + headerBox.node.getAttribute("show_header_mode") +
-                    " and didn't change back.");
-}
-
 /**
  * @param headerName used for pretty-printing in exceptions
  * @param headerValueElement code to be eval()ed returning the DOM element
  *        with the data.
  * @param expectedName code to be eval()ed returning the expected value of
  *                     nsIAccessible.name for the DOM element in question
  * @param expectedRole the expected value for nsIAccessible.role
  */
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -116,17 +116,16 @@ class ThunderTestProfile(mozrunner.Thund
         'mail.spotlight.firstRunDone': True,
         # disable address books for undisclosed reasons
         'ldap_2.servers.osx.position': 0,
         'ldap_2.servers.oe.position': 0,
         # disable the first use junk dialog
         'mailnews.ui.junk.firstuse': False,
         # other unknown voodoo
         # -- dummied up local accounts to stop the account wizard
-        'mail.account.account1.identities' :  "id1",
         'mail.account.account1.server' :  "server1",
         'mail.account.account2.identities' :  "id1,id2",
         'mail.account.account2.server' :  "server2",
         'mail.accountmanager.accounts' :  "account1,account2",
         'mail.accountmanager.defaultaccount' :  "account2",
         'mail.accountmanager.localfoldersserver' :  "server1",
         'mail.identity.id1.fullName' :  "Tinderbox",
         'mail.identity.id1.htmlSigFormat' : False,
--- a/mailnews/test/performance/bloat/mailnewsTestPrefs.js
+++ b/mailnews/test/performance/bloat/mailnewsTestPrefs.js
@@ -1,15 +1,14 @@
 // This set of prefs is copyied over the defaults that build-seamonkey-util.pl
 // sets up.
 user_pref("browser.dom.window.dump.enabled", true);
 // no slow script dialogs
 user_pref("dom.max_chrome_script_run_time", 0);
 user_pref("dom.max_script_run_time", 0);
-user_pref("mail.account.account1.identities", "id1");
 user_pref("mail.account.account1.server", "server1");
 user_pref("mail.account.account2.identities", "id1");
 user_pref("mail.account.account2.server", "server2");
 user_pref("mail.accountmanager.accounts", "account1,account2");
 user_pref("mail.accountmanager.defaultaccount", "account2");
 user_pref("mail.accountmanager.localfoldersserver", "server1");
 user_pref("mail.identity.id1.fullName", "Tinderbox");
 user_pref("mail.identity.id1.smtpServer", "smtp1");