Backed out changeset 27f8d501cef5 (bug 1061469)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 02 Oct 2014 14:00:09 +0200
changeset 231598 d1dfdafb5d7caa218a6d76106c4ad9eda9573394
parent 231597 6ac9e415cb425456adba8a11b5d4fe62f028c576
child 231599 28d109731c7cb6b877051002a34046b11b37c4e7
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 out27f8d501cef5cf165cb175a8494d207fdb658bd2
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 27f8d501cef5 (bug 1061469)
content/html/content/test/imports/file_cycle_2_A.html
content/html/content/test/imports/file_cycle_2_B.html
content/html/content/test/imports/file_cycle_2_C.html
content/html/content/test/imports/file_cycle_2_D.html
content/html/content/test/imports/mochitest.ini
content/html/content/test/imports/test_cycle_2.html
deleted file mode 100644
--- a/content/html/content/test/imports/file_cycle_2_A.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_2_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_2_B.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <link rel="import" href="file_cycle_2_A.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_2_C.html" onload="loaded()" onerror="failed()"></link>
-  <link rel="import" href="file_cycle_2_D.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_2_C.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-</head>
-<body>
-  <script>
-    order.push("C");
-  </script>
-</body>
-</html>
deleted file mode 100644
--- a/content/html/content/test/imports/file_cycle_2_D.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-</head>
-<body>
-  <script>
-    order.push("D");
-  </script>
-</body>
-</html>
--- a/content/html/content/test/imports/mochitest.ini
+++ b/content/html/content/test/imports/mochitest.ini
@@ -14,16 +14,11 @@ support-files =
   file_importC8.html
   file_importC9.html
   file_importC10.html
   file_importD.html
   file_importE.html
   file_cycle_1_A.html
   file_cycle_1_B.html
   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
+
 [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
deleted file mode 100644
--- a/content/html/content/test/imports/test_cycle_2.html
+++ /dev/null
@@ -1,36 +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_2_A.html" onload="loaded()" onerror="failed()"></link>
-  <script type="text/javascript">
-    is(counter, 5, "Imports are loaded");
-    is(fcounter, 0, "No error in imports");
-    var expected = ["C","D","B","A"];
-    for (i in expected)
-      is(order[i], expected[i], "import " + i + " should be " + expected[i]);
-    SimpleTest.finish();
-  </script>
-</body>
-</html>