From d3c5cce268d5f4a35c40cc10afce18eb3f1c6e9e Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Mon, 22 Aug 2016 12:01:53 +0200
Subject: [PATCH] Bug 1286895 - Remove a test for checking the number of
 created workers, r=me

---
 dom/workers/test/mochitest.ini        |  1 -
 dom/workers/test/test_bug1241485.html | 84 ---------------------------
 2 files changed, 85 deletions(-)
 delete mode 100644 dom/workers/test/test_bug1241485.html
diff --git a/dom/workers/test/mochitest.ini b/dom/workers/test/mochitest.ini
index d7dc1292c800..57625bc6da3f 100644
--- a/dom/workers/test/mochitest.ini
+++ b/dom/workers/test/mochitest.ini
@@ -144,7 +144,6 @@ support-files =
 [test_bug1132395.html]
 skip-if = true # bug 1176225
 [test_bug1132924.html]
-[test_bug1241485.html]
 [test_chromeWorker.html]
 [test_clearTimeouts.html]
 [test_close.html]
diff --git a/dom/workers/test/test_bug1241485.html b/dom/workers/test/test_bug1241485.html
deleted file mode 100644
index 0ad31226c64a..000000000000
--- a/dom/workers/test/test_bug1241485.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1241485
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 1241485</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-
-  /** Test for Bug 1241485 **/
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestCompleteLog();
-SimpleTest.requestFlakyTimeout("requestFlakyTimeout is silly.");
-
-var limit = 10;
-
-SpecialPowers.pushPrefEnv({"set":[["dom.workers.maxPerDomain", limit]] },
-function() {
-  var workers = new Array();
-  var workerToWait = null;
-  var url = URL.createObjectURL(new Blob(["postMessage('loaded');"]));
-  var timeouts = new Array();
-
-  function addTimeout(fn, time) {
-    timeouts.push(setTimeout(fn, time));
-  }
-
-  function createWorker() {
-    workerToWait = new Worker(url);
-    workerToWait.onmessage = function(e) {
-        if (!workers) {
-          // finish() has been called already.
-          return;
-        }
-        workers.push(workerToWait);
-        info(workers.length + " workers");
-        addTimeout(createWorker, 0);
-        if (workers.length == limit) {
-          // Just give the worker creation loop some more time to try to
-          // create more workers to check that we don't go over the limit.
-          addTimeout(finish, 250);
-        }
-      };
-  }
-
-  function finish() {
-    for (var i = 0; i < timeouts.length; ++i) {
-      clearTimeout(timeouts[i]);
-    }
-
-    if (workerToWait) {
-      workerToWait.onmessage = null;
-    }
-
-    ok(workers.length <= limit, "Too many workers created!");
-
-    workers = null;
-    SpecialPowers.gc();
-
-    SimpleTest.finish();
-  }
-
-  info("Expecting no more than " + limit + " workers.");
-  // Make sure we finish at some point, even if creating workers takes
-  // lots of time.
-  addTimeout(finish, 10000);
-  addTimeout(createWorker, 0);
-});
-
-  </script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1241485">Mozilla Bug 1241485</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>
