Bug 1061469 - part10: Removing intermittent import test. r=mrbkap, a=test-only
authorGabor Krizsanits <gkrizsanits@mozilla.com>
Fri, 31 Oct 2014 13:03:03 +0100
changeset 234970 71ac3e837bb71f04be8db1fed52299554fc445fb
parent 234969 84f5013c9e137b8a4ecc0a852d91b0bc615b7732
child 234971 69d6e7ad02abce8571216c54fdb112095d4d3bc7
push id611
push userraliiev@mozilla.com
push dateMon, 05 Jan 2015 23:23:16 +0000
treeherdermozilla-release@345cd3b9c445 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap, test-only
bugs1061469
milestone35.0a2
Bug 1061469 - part10: Removing intermittent import test. r=mrbkap, a=test-only
content/html/content/test/imports/file_cycle_5_A.html
content/html/content/test/imports/file_cycle_5_B.html
content/html/content/test/imports/file_cycle_5_C.html
content/html/content/test/imports/file_cycle_5_D.html
content/html/content/test/imports/mochitest.ini
content/html/content/test/imports/test_cycle_5.html
deleted file mode 100644
--- a/content/html/content/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/content/html/content/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/content/html/content/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/content/html/content/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/content/html/content/test/imports/mochitest.ini
+++ b/content/html/content/test/imports/mochitest.ini
@@ -40,11 +40,9 @@ support-files =
 [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]
deleted file mode 100644
--- a/content/html/content/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>