Bug 1266823 - Partly backout changes from bug 1258835. r=philipp a=jorgk
authormakemyday@gmx-topmail.de
Fri, 06 May 2016 14:32:22 +0200
changeset 27189 e0db7f7c33c88ee4ed4d48851bcdf5ce31f2a346
parent 27188 724410b84b45b71da804493e4b6de42bcfdd8a4c
child 27190 3394a4eee5d937deb973f98e27e098730bee2312
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)
reviewersphilipp, jorgk
bugs1266823, 1258835
Bug 1266823 - Partly backout changes from bug 1258835. r=philipp a=jorgk
calendar/test/unit/test_gdata_provider.js
--- a/calendar/test/unit/test_gdata_provider.js
+++ b/calendar/test/unit/test_gdata_provider.js
@@ -443,19 +443,27 @@ function getAllMeta(calendar) {
     let keys = {}, values = {};
     calendar.getAllMetaData({}, keys, values);
     return new Map(keys.value.map((k,i) => [k,values.value[i]]));
 }
 
 function run_test() {
     replaceAlertsService();
 
-    gServer = new GDataServer("xpcshell@example.com", "tasksId");
-    gServer.start();
-    do_calendar_startup(run_next_test);
+    // TODO: make do_calendar_startup to work with this test and replace the startup code here
+    do_get_profile();
+    do_test_pending();
+    cal.getCalendarManager().startup({onResult: function() {
+        gServer = new GDataServer("xpcshell@example.com", "tasksId");
+        gServer.start();
+        cal.getTimezoneService().startup({onResult: function() {
+            run_next_test();
+            do_test_finished();
+        }});
+    }});
 }
 
 add_task(function* test_migrate_cache() {
     let uriString = "googleapi://xpcshell/?calendar=xpcshell%40example.com";
     let uri = Services.io.newURI(uriString, null, null);
     let client = cal.getCalendarManager().createCalendar("gdata", uri);
     let unwrapped = client.wrappedJSObject;
     let migrateStorageCache = unwrapped.migrateStorageCache.bind(unwrapped);