Backed out changeset 62486f51f316 (bug 1061469)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 02 Oct 2014 14:00:03 +0200
changeset 231595 dd4be19ee149b4b97e82b7cf0893449cb1f5d9a8
parent 231594 1abc9335763e348a695b3b84f36e7fe607ec2bdf
child 231596 4116e175b2e0cb4102fb886519a8f6066c5aae8c
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1061469
milestone35.0a1
backs out62486f51f316a525ed6506fe2e3a1565db1016e0
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
Backed out changeset 62486f51f316 (bug 1061469)
content/html/content/test/imports/file_cycle_4_A.html
content/html/content/test/imports/file_cycle_4_B.html
content/html/content/test/imports/file_cycle_4_C.html
content/html/content/test/imports/file_cycle_4_D.html
content/html/content/test/imports/file_cycle_4_E.html
content/html/content/test/imports/mochitest.ini
content/html/content/test/imports/test_cycle_4.html
deleted file mode 100644
--- a/content/html/content/test/imports/file_cycle_4_A.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_4_B.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-  <script>
-    order.push("A");
-  </script>
-</body>
-</html>
deleted file mode 100644
--- a/content/html/content/test/imports/file_cycle_4_B.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_4_C.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-  <script>
-    order.push("B");
-  </script>
-</body>
-</html>
deleted file mode 100644
--- a/content/html/content/test/imports/file_cycle_4_C.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_4_D.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-  <script>
-    order.push("C");
-  </script>
-</body>
-</html>
deleted file mode 100644
--- a/content/html/content/test/imports/file_cycle_4_D.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_4_B.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_4_E.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-  <script>
-    order.push("D");
-  </script>
-</body>
-</html>
deleted file mode 100644
--- a/content/html/content/test/imports/file_cycle_4_E.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_4_C.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-  <script>
-    order.push("E");
-  </script>
-</body>
-</html>
--- a/content/html/content/test/imports/mochitest.ini
+++ b/content/html/content/test/imports/mochitest.ini
@@ -21,22 +21,15 @@ support-files =
   file_cycle_1_C.html
   file_cycle_2_A.html
   file_cycle_2_B.html
   file_cycle_2_C.html
   file_cycle_2_D.html
   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
 
 [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
deleted file mode 100644
--- a/content/html/content/test/imports/test_cycle_4.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_4_A.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_4_D.html" onload="loaded()" onerror="failed()"></link>
-  <script type="text/javascript">
-    is(counter, 8, "Imports are loaded");
-    is(fcounter, 0, "No error in imports");
-    var expected = ["E","D","C","B","A"];
-    for (i in expected)
-      is(order[i], expected[i], "import " + i + " should be " + expected[i]);
-    SimpleTest.finish();
-  </script>
-</body>
-</html>