Bug 1061469 - part10: Removing intermittent import test. r=mrbkap
authorGabor Krizsanits <gkrizsanits@mozilla.com>
Fri, 31 Oct 2014 13:03:03 +0100
changeset 213393 f754a82c5560cf1deccfbfeeac35519740a00eda
parent 213392 34781adab80af2113ccae821cf09f0880439e5f0
child 213394 566edf2a7ad3974cf20144e88323afd1f5327532
push id27748
push userryanvm@gmail.com
push dateFri, 31 Oct 2014 20:14:33 +0000
treeherdermozilla-central@12ac66e2c016 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs1061469
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1061469 - part10: Removing intermittent import test. r=mrbkap
dom/html/test/imports/file_cycle_5_A.html
dom/html/test/imports/file_cycle_5_B.html
dom/html/test/imports/file_cycle_5_C.html
dom/html/test/imports/file_cycle_5_D.html
dom/html/test/imports/mochitest.ini
dom/html/test/imports/test_cycle_5.html
deleted file mode 100644
--- a/dom/html/test/imports/file_cycle_5_A.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_5_B.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_5_D.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_5_C.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-  <script>
-    order.push("A");
-  </script>
-</body>
-</html>
deleted file mode 100644
--- a/dom/html/test/imports/file_cycle_5_B.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_5_A.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_5_C.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_5_D.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-  <script>
-    order.push("B");
-  </script>
-</body>
-</html>
deleted file mode 100644
--- a/dom/html/test/imports/file_cycle_5_C.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_5_A.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_5_B.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_5_D.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-  <script>
-    order.push("C");
-  </script>
-</body>
-</html>
deleted file mode 100644
--- a/dom/html/test/imports/file_cycle_5_D.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_5_A.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_5_B.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_5_C.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-  <script>
-    order.push("D");
-  </script>
-</body>
-</html>
--- a/dom/html/test/imports/mochitest.ini
+++ b/dom/html/test/imports/mochitest.ini
@@ -26,27 +26,21 @@ support-files =
   file_cycle_3_A.html
   file_cycle_3_B.html
   file_cycle_3_C.html
   file_cycle_4_A.html
   file_cycle_4_B.html
   file_cycle_4_C.html
   file_cycle_4_D.html
   file_cycle_4_E.html
-  file_cycle_5_A.html
-  file_cycle_5_B.html
-  file_cycle_5_C.html
-  file_cycle_5_D.html
   file_encoding.html
   file_simple_import.html
 
 [test_cycle_1.html]
 skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
 [test_cycle_2.html]
 skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
 [test_cycle_3.html]
 skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
 [test_cycle_4.html]
 skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
-[test_cycle_5.html]
-skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
 [test_encoding.html]
 [test_defaultView.html]
deleted file mode 100644
--- a/dom/html/test/imports/test_cycle_5.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1061469
--->
-<head>
-  <title>Test for Bug 1061469</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-</head>
-<body>
-  <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1061469">Mozilla Bug 1061469</a>
-  <script type="text/javascript">
-    SimpleTest.waitForExplicitFinish();
-    var counter = 0;
-    var fcounter = 0;
-    var order = [];
-    function loaded() {
-      counter++;
-    }
-    function failed() {
-      fcounter++;
-    }
-  </script>
-  <link rel="import" href="file_cycle_5_A.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_5_C.html" onload="loaded()" onerror="failed()"></link>
-  <script type="text/javascript">
-    is(counter, 14, "Imports are loaded");
-    is(fcounter, 0, "No error in imports");
-    var expected = ["D","C","B","A"];
-    for (i in expected)
-      is(order[i], expected[i], "import " + i + " should be " + expected[i]);
-    SimpleTest.finish();
-  </script>
-</body>
-</html>