Bug 619238: fix intermittent test failure. r=philiKON

services/sync/tests/unit/test_service_detect_upgrade.js

@@ -11,7 +11,7 @@ Cu.import("resource://services-sync/log4moz.js");
   
 Engines.register(TabEngine);
 
-function v4_upgrade() {
+function v4_upgrade(next) {
   let passphrase = "abcdeabcdeabcdeabcdeabcdea";
 
   let clients = new ServerCollection();
@@ -22,7 +22,6 @@ function v4_upgrade() {
   let upd = collectionsHelper.with_updated_collection;
   let collections = collectionsHelper.collections;
 
-  do_test_pending();
   let keysWBO = new ServerWBO("keys");
   let server = httpd_setup({
     // Special.
@@ -186,11 +185,11 @@ function v4_upgrade() {
     
   } finally {
     Weave.Svc.Prefs.resetBranch("");
-    server.stop(do_test_finished);
+    server.stop(next);
   }
 }
 
-function v5_upgrade() {
+function v5_upgrade(next) {
   let passphrase = "abcdeabcdeabcdeabcdeabcdea";
 
   // Tracking info/collections.
@@ -203,7 +202,6 @@ function v5_upgrade() {
   let clients = new ServerCollection();
   let meta_global = new ServerWBO('global');
   
-  do_test_pending();
   let server = httpd_setup({
     // Special.
     "/1.0/johndoe/storage/meta/global": upd("meta", meta_global.handler()),
@@ -295,7 +293,7 @@ function v5_upgrade() {
     
   } finally {
     Weave.Svc.Prefs.resetBranch("");
-    server.stop(do_test_finished);
+    server.stop(next);
   }
 }
 
@@ -303,6 +301,7 @@ function run_test() {
   let logger = Log4Moz.repository.rootLogger;
   Log4Moz.repository.rootLogger.addAppender(new Log4Moz.DumpAppender());
   
-  v4_upgrade();
-  v5_upgrade();
+  do_test_pending();
+  Utils.asyncChain(v4_upgrade, v5_upgrade,
+                   do_test_finished)();
 }