Try to workaround orange caused by disabling test_browserGlue_distribution.js
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 15 Apr 2010 01:26:15 +0200
changeset 40773 e7b494de5471715037ef3fa0ff2e8dcf2329a3e5
parent 40772 490fba6cd22af3d039c15799ab40759837e1044d
child 40774 901155284571823a8749907aded74db35a98609f
push id12811
push usermak77@bonardo.net
push dateWed, 14 Apr 2010 23:29:21 +0000
treeherdermozilla-central@e7b494de5471 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Try to workaround orange caused by disabling test_browserGlue_distribution.js
browser/components/places/tests/unit/test_browserGlue_distribution.js
--- a/browser/components/places/tests/unit/test_browserGlue_distribution.js
+++ b/browser/components/places/tests/unit/test_browserGlue_distribution.js
@@ -45,16 +45,20 @@
 const PREF_SMART_BOOKMARKS_VERSION = "browser.places.smartBookmarksVersion";
 const PREF_BMPROCESSED = "distribution.516444.bookmarksProcessed";
 const PREF_DISTRIBUTION_ID = "distribution.id";
 
 const TOPIC_FINAL_UI_STARTUP = "final-ui-startup";
 const TOPIC_CUSTOMIZATION_COMPLETE = "distribution-customization-complete";
 
 function run_test() {
+  // This is needed but we still have to investigate the reason, could just be
+  // we try to act too late in the game, moving our shutdown earlier will help.
+  let hs = Cc["@mozilla.org/browser/nav-history-service;1"].
+         getService(Ci.nsINavHistoryService);
   // TODO: re-enable when bug 523936 is fixed.
   return;
 
   do_test_pending();
 
   // Copy distribution.ini file to our app dir.
   let distroDir = Services.dirsvc.get("XCurProcD", Ci.nsIFile);
   distroDir.append("distribution");