diff --git a/dom/tests/browser/perfmetrics/browser.ini b/dom/tests/browser/perfmetrics/browser.ini index 03a27915bbd6..5bff2f0ecbdd 100644 --- a/dom/tests/browser/perfmetrics/browser.ini +++ b/dom/tests/browser/perfmetrics/browser.ini @@ -10,6 +10,7 @@ support-files = ping_worker.js setinterval.html settimeout.html + shared_worker.js unresponsive.html hello.ogg sound.html diff --git a/dom/tests/browser/perfmetrics/browser_test_performance_metrics.js b/dom/tests/browser/perfmetrics/browser_test_performance_metrics.js index 31c1d4987763..b1f869a6686e 100644 --- a/dom/tests/browser/perfmetrics/browser_test_performance_metrics.js +++ b/dom/tests/browser/perfmetrics/browser_test_performance_metrics.js @@ -138,9 +138,7 @@ add_task(async function test() { Assert.ok(isTopLevel, "example.com as a top level window"); Assert.ok(aboutMemoryFound, "about:memory"); Assert.ok(heapUsage > 0, "got some memory value reported"); - // FIXME bug 1522246. the worker performance improvements in this bug cause - // the shared worker to shut down too quickly to report any info. - // Assert.ok(sharedWorker, "We got some info from a shared worker"); + Assert.ok(sharedWorker, "We got some info from a shared worker"); let numCounters = counterIds.length; Assert.ok(numCounters > 5, "This test generated at least " + numCounters + " unique counters"); diff --git a/dom/tests/browser/perfmetrics/ping_worker2.html b/dom/tests/browser/perfmetrics/ping_worker2.html index 6f6dfc66e485..48f665821860 100644 --- a/dom/tests/browser/perfmetrics/ping_worker2.html +++ b/dom/tests/browser/perfmetrics/ping_worker2.html @@ -9,7 +9,7 @@ function init() { shared = new SharedWorker("shared_worker.js"); shared.port.start(); - for (let i = 0; i++; i < 10) shared.port.postMessage(["ok"]); + for (let i = 0; i < 10; i++) shared.port.postMessage(["ok"]); } diff --git a/dom/tests/browser/shared_worker.js b/dom/tests/browser/perfmetrics/shared_worker.js similarity index 100% rename from dom/tests/browser/shared_worker.js rename to dom/tests/browser/perfmetrics/shared_worker.js