Bug 1154747 - disable calendar integration notification during test, so height is predictable. r=rkent, a=rkent
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Fri, 22 May 2015 22:22:07 +0300
changeset 26154 fae74ec74a56ee892b9a1649d697c9ea4a031bfb
parent 26153 05aab6c8e0e097d86240a6805cebe1ec41db20cc
child 26155 81353f66b3949ca70a4f937ae31d227607364946
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrkent, rkent
bugs1154747
Bug 1154747 - disable calendar integration notification during test, so height is predictable. r=rkent, a=rkent TEST-UNEXPECTED-FAIL | /builds/slave/test/build/tests/mozmill/session-store/test-session-store.js | test-session-store.js::test_message_pane_height_persistence
mail/test/mozmill/session-store/test-session-store.js
--- a/mail/test/mozmill/session-store/test-session-store.js
+++ b/mail/test/mozmill/session-store/test-session-store.js
@@ -83,29 +83,34 @@ function setupModule(module) {
   folderB = create_folder("SessionStoreB");
   make_new_sets_in_folder(folderB, [{count: 3}]);
 
   // clobber the default interval used by the session autosave timer so the
   // unit tests end up being as close to instantaneous as possible
   sessionStoreManager._sessionAutoSaveTimerIntervalMS = 100;
 
   sessionStoreManager.stopPeriodicSave();
+
+  // Opt out of calendar promotion so we don't show the "ligthing now
+  // integrated" notification bar (which gives us unexpected heights).
+  Services.prefs.setBoolPref("calendar.integration.notify", false);
 }
 
 function teardownTest(test) {
   sessionStoreManager.stopPeriodicSave();
 }
 
 function teardownModule(module) {
   // reset the interval used by the session autosave timer to the default
   // value
   sessionStoreManager._sessionAutoSaveTimerIntervalMS =
                               sessionStoreManager.SESSION_AUTO_SAVE_DEFAULT_MS;
   folderA.Delete();
   folderB.Delete();
+  Services.prefs.clearUserPref("calendar.integration.notify");
 }
 
 function test_periodic_session_persistence_simple() {
   // delete the session file if it exists
   let sessionFile = sessionStoreManager.sessionFile;
   if (sessionFile.exists())
     sessionFile.remove(false);