Backed out changeset d90e308bfb98 (bug 1159813) for "test_importscript.html | Unregister should return true" failures

CLOSED TREE
2015-04-29 20:15:34 -07:00 · 2015-04-29 20:15:34 -07:00 · fee82dca85
--- a/dom/workers/test/serviceworkers/importscript.sjs
+++ b/dom/workers/test/serviceworkers/importscript.sjs
@ -1,7 +1,5 @@
 function handleRequest(request, response) {
-  if (request.queryString == 'clearcounter') {
-    setState('counter', '');
-  } else if (!getState('counter')) {
+  if (!getState('counter')) {
    response.setHeader("Content-Type", "application/javascript", false);
    response.write("callByScript();");
    setState('counter', '1');
--- a/dom/workers/test/serviceworkers/periodic.sjs
+++ b/dom/workers/test/serviceworkers/periodic.sjs
@ -1,8 +1,4 @@
 function handleRequest(request, response) {
-  if (request.queryString == 'clearcounter') {
-    setState('periodiccounter', '');
-    return;
-  }
  if (!getState('periodiccounter')) {
    setState('periodiccounter', '1');
  } else {
--- a/dom/workers/test/serviceworkers/periodic/unregister.html
+++ b/dom/workers/test/serviceworkers/periodic/unregister.html
@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <script>
-  fetch("../periodic.sjs?clearcounter").then(function() {
-    return navigator.serviceWorker.getRegistration(".");
-  }).then(function(registration) {
+  navigator.serviceWorker.getRegistration(".").then(function(registration) {
    registration.unregister().then(function(success) {
      if (success) {
        parent.callback();
--- a/dom/workers/test/serviceworkers/test_importscript.html
+++ b/dom/workers/test/serviceworkers/test_importscript.html
@ -19,9 +19,7 @@
  }

  function unregister() {
-    fetch("importscript.sjs?clearcounter").then(function() {
-      return registration.unregister();
-    }).then(function(result) {
+    return registration.unregister().then(function(result) {
      ok(result, "Unregister should return true.");
    }, function(e) {
      dump("Unregistering the SW failed with " + e + "\n");