diff --git a/.eslintrc-rollouts.js b/.eslintrc-rollouts.js index fbc6e12fdcf00cbebcd7221ca6a1d0029b71bbda..4584a20efd3a26e96bb0c9ee36a9ad734eb00f27 100644 --- a/.eslintrc-rollouts.js +++ b/.eslintrc-rollouts.js @@ -1711,7 +1711,6 @@ const rollouts = [ "dom/tests/mochitest/fetch/test_response.js", "dom/tests/mochitest/general/resource_timing_cross_origin.html", "dom/tests/mochitest/general/test_frameElementWrapping.html", - "dom/tests/mochitest/general/test_network_events.html", "dom/tests/mochitest/general/window_clipboard_events.html", "dom/tests/mochitest/localstorage/test_keySync.html", "dom/tests/mochitest/localstorage/test_localStorageFromChrome.xhtml", diff --git a/dom/tests/mochitest/general/mochitest.toml b/dom/tests/mochitest/general/mochitest.toml index 06137a8dd9ae09fa0a16a92c507573c0ae30a613..1de207563564e7ced5e8780a3d56657aa18892ae 100644 --- a/dom/tests/mochitest/general/mochitest.toml +++ b/dom/tests/mochitest/general/mochitest.toml @@ -158,9 +158,6 @@ scheme = "https" ["test_navigation_timing.html"] -["test_network_events.html"] -skip-if = ["true"] # Disable this test until bug 795711 is fixed. - ["test_offsets.html"] support-files = ["test_offsets.js"] diff --git a/dom/tests/mochitest/general/test_network_events.html b/dom/tests/mochitest/general/test_network_events.html deleted file mode 100644 index 5763cf1fff34a8d2baeeed851ee6da7d2bdd1937..0000000000000000000000000000000000000000 --- a/dom/tests/mochitest/general/test_network_events.html +++ /dev/null @@ -1,72 +0,0 @@ -<!DOCTYPE HTML> -<html> -<!-- -https://bugzilla.mozilla.org/show_bug.cgi?id=795136 ---> -<head> - <meta charset="utf-8"> - <title>Test for moznetworkupload and moznetworkdownload</title> - <script src="/tests/SimpleTest/SimpleTest.js"></script> - <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> -</head> -<body> -<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=795136">Mozilla Bug 795136</a> -<p id="display"></p> -<div id="content"> - -</div> -<pre id="test"> -<script type="application/javascript"> - -/** Test for Bug 795136 **/ - -SimpleTest.waitForExplicitFinish(); - -SpecialPowers.addPermission("network-events", true, document); - -var gNetworkUpload = false; -var gNetworkDownload = false; - -function isFinished() { - return gNetworkUpload && gNetworkDownload; -} - -function finish() { - removeEventListener('moznetworkupload', uploadHandler); - removeEventListener('moznetworkdownload', downloadHandler); - - SpecialPowers.removePermission("network-events", document); - - SimpleTest.finish(); -} - -function uploadHandler() { - ok(true, 'got a network upload event'); - gNetworkUpload = true; - - if (isFinished()) { - finish(); - } -} - -function downloadHandler() { - ok(true, 'got a network download event'); - gNetworkDownload = true; - - if (isFinished()) { - finish(); - } -} - -addEventListener('moznetworkupload', uploadHandler); -addEventListener('moznetworkdownload', downloadHandler); - -var iframe = document.createElement('iframe'); -iframe.src = 'http://mozilla.org'; - -document.getElementById('content').appendChild(iframe); - -</script> -</pre> -</body> -</html>