Backed out changeset e7c3be44c703 (bug 1061469) for Android m-11 test failures on a CLOSED TREE

This commit is contained in:
Carsten "Tomcat" Book 2014-10-02 14:00:38 +02:00
parent 03ac914b8b
commit 42703680b6
5 changed files with 1 additions and 76 deletions

View File

@ -1,11 +0,0 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<link rel="import" href="file_cycle_1_B.html" onload="loaded()" onerror="failed()"></link>
</head>
<body>
<script>
order.push("A");
</script>
</body>
</html>

View File

@ -1,12 +0,0 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<link rel="import" href="file_cycle_1_C.html" onload="loaded()" onerror="failed()"></link>
<link rel="import" href="file_cycle_1_A.html" onload="loaded()" onerror="failed()"></link>
</head>
<body>
<script>
order.push("B");
</script>
</body>
</html>

View File

@ -1,12 +0,0 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<link rel="import" href="file_cycle_1_B.html" onload="loaded()" onerror="failed()"></link>
<link rel="import" href="file_cycle_1_A.html" onload="loaded()" onerror="failed()"></link>
</head>
<body>
<script>
order.push("C");
</script>
</body>
</html>

View File

@ -16,9 +16,5 @@ support-files =
file_importC10.html
file_importD.html
file_importE.html
file_cycle_1_A.html
file_cycle_1_B.html
file_cycle_1_C.html
[test_cycle_1.html]
skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator

View File

@ -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_1_A.html" onload="loaded()" onerror="failed()"></link>
<script type="text/javascript">
is(counter, 6, "Imports are loaded");
is(fcounter, 0, "No error in imports");
var expected = ["C","B","A"];
for (i in expected)
is(order[i], expected[i], "import " + i + " should be " + expected[i]);
SimpleTest.finish();
</script>
</body>
</html>