From 8a4eee33d20e189078c328a8c61077be762ff9dc Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Mon, 23 May 2016 02:46:27 -0700 Subject: [PATCH] Bug 1254741 P3 Fix push test_serviceworker_lifetime.html test to expect new behavior. r=kitcambridge --- dom/push/test/test_serviceworker_lifetime.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dom/push/test/test_serviceworker_lifetime.html b/dom/push/test/test_serviceworker_lifetime.html index ce61c1cf6d50..8706e1fba2eb 100644 --- a/dom/push/test/test_serviceworker_lifetime.html +++ b/dom/push/test/test_serviceworker_lifetime.html @@ -269,14 +269,19 @@ ["dom.serviceWorkers.idle_extended_timeout", 2999999] ], steps: function(ctx) { - // Non push workers are terminated when they stop controlling documents. + // Older versions used to terminate workers when the last controlled + // window was closed. This should no longer happen, though. Verify + // the new behavior. return createIframe(ctx) .then(setShutdownObserver(true)) .then(checkStateAndUpdate(fetchEvent, "from_scope", "wait")) .then(closeIframe) + .then(setShutdownObserver(true)) + .then(checkStateAndUpdate(messageEvent, "wait", "release")) .then(waitOnShutdownObserver) - // Push workers are exempt from this rule. + // Push workers were exempt from the old rule and should continue to + // survive past the closing of the last controlled window. .then(createIframe) .then(setShutdownObserver(false)) .then(checkStateAndUpdate(pushEvent, "from_scope", "wait"))