diff --git a/dom/workers/test/browser.ini b/dom/workers/test/browser.ini index ae1e27d13a70..c9fd854b541a 100644 --- a/dom/workers/test/browser.ini +++ b/dom/workers/test/browser.ini @@ -5,7 +5,6 @@ support-files = frame_script.js head.js !/dom/base/test/file_empty.html - !/dom/base/test/file_bug945152.jar [browser_bug1047663.js] [browser_bug1104623.js] diff --git a/dom/workers/test/bug1063538.sjs b/dom/workers/test/bug1063538.sjs new file mode 100644 index 000000000000..5d2570747be7 --- /dev/null +++ b/dom/workers/test/bug1063538.sjs @@ -0,0 +1,6 @@ +function handleRequest(request, response) { + response.processAsync(); + response.write("Hello"); + setTimeout(function() { response.finish(); }, 100000); // wait 100 seconds. +} + diff --git a/dom/workers/test/bug1063538_worker.js b/dom/workers/test/bug1063538_worker.js index dc53dd2891aa..caf03af0044f 100644 --- a/dom/workers/test/bug1063538_worker.js +++ b/dom/workers/test/bug1063538_worker.js @@ -3,7 +3,7 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -var gJar = "jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_big.txt"; +var gURL = "http://example.org/tests/dom/workers/test/bug1063538.sjs"; var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true}); var progressFired = false; @@ -20,6 +20,6 @@ xhr.onprogress = function(e) { }; onmessage = function(e) { - xhr.open("GET", gJar, true); + xhr.open("GET", gURL, true); xhr.send(); } diff --git a/dom/workers/test/mochitest.ini b/dom/workers/test/mochitest.ini index 087d774a2908..95f9baf9821e 100644 --- a/dom/workers/test/mochitest.ini +++ b/dom/workers/test/mochitest.ini @@ -94,7 +94,6 @@ support-files = script_createFile.js worker_suspended.js window_suspended.html - !/dom/base/test/file_bug945152.jar !/dom/notification/test/mochitest/MockServices.js !/dom/notification/test/mochitest/NotificationTest.js !/dom/xhr/tests/relativeLoad_import.js diff --git a/dom/workers/test/test_bug1063538.html b/dom/workers/test/test_bug1063538.html index 7c32b8ed3bcf..7d20bdd5f10a 100644 --- a/dom/workers/test/test_bug1063538.html +++ b/dom/workers/test/test_bug1063538.html @@ -38,9 +38,7 @@ function runTest() { SimpleTest.waitForExplicitFinish(); addLoadEvent(function() { - SpecialPowers.pushPrefEnv({"set": [["network.jar.block-remote-files", false]]}, function() { - SpecialPowers.pushPermissions([{'type': 'systemXHR', 'allow': true, 'context': document}], runTest); - }); + SpecialPowers.pushPermissions([{'type': 'systemXHR', 'allow': true, 'context': document}], runTest); });