Bug 1241181: Test for bug 1232274 should use promises to restart the add-ons manager. r=rhelmer
authorDave Townsend <dtownsend@oxymoronical.com>
Wed, 20 Jan 2016 10:01:34 -0800
changeset 303032 ababaae69ec618ed9740dd898c65be77cb37b8db
parent 303031 a4d3504abe124b5c42daeb1b5d268e2a6a5cc4c1
child 303033 b67a5343e79fef3d6e949e1c437c9a0e5435e3e7
push id8978
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 14:05:32 +0000
treeherdermozilla-aurora@b9a803752a2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrhelmer
bugs1241181, 1232274
milestone46.0a1
Bug 1241181: Test for bug 1232274 should use promises to restart the add-ons manager. r=rhelmer Really for consistency than anything else.
toolkit/mozapps/extensions/test/xpcshell/test_e10s_restartless.js
--- a/toolkit/mozapps/extensions/test/xpcshell/test_e10s_restartless.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_e10s_restartless.js
@@ -34,17 +34,17 @@ function* check_normal() {
   do_check_true(addon.isActive);
   do_check_false(hasFlag(addon.pendingOperations, AddonManager.PENDING_ENABLE));
 
   do_check_false(hasFlag(addon.operationsRequiringRestart, AddonManager.OP_NEEDS_RESTART_UNINSTALL));
   addon.uninstall();
   BootstrapMonitor.checkAddonNotStarted(ID);
   BootstrapMonitor.checkAddonNotInstalled(ID);
 
-  restartManager();
+  yield promiseRestartManager();
 }
 
 // Installing the add-on normally doesn't require a restart
 add_task(function*() {
   gAppInfo.browserTabsRemoteAutostart = false;
   Services.prefs.setBoolPref("extensions.e10sBlocksEnabling", false);
 
   yield check_normal();
@@ -107,17 +107,17 @@ add_task(function*() {
   do_check_true(addon.isActive);
   BootstrapMonitor.checkAddonStarted(ID);
 
   do_check_false(hasFlag(addon.operationsRequiringRestart, AddonManager.OP_NEEDS_RESTART_UNINSTALL));
   addon.uninstall();
   BootstrapMonitor.checkAddonNotStarted(ID);
   BootstrapMonitor.checkAddonNotInstalled(ID);
 
-  restartManager();
+  yield promiseRestartManager();
 });
 
 // The hotfix is unaffected
 add_task(function*() {
   gAppInfo.browserTabsRemoteAutostart = true;
   Services.prefs.setBoolPref("extensions.e10sBlocksEnabling", true);
   Services.prefs.setCharPref("extensions.hotfix.id", ID);