mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1261158 - Convert test_removal_onload.html to a mochitest-plain. r=tnikkel 

MozReview-Commit-ID: DL4IQaUl7t5
This commit is contained in:
Kartikaya Gupta 2016-04-04 16:28:12 -04:00
Родитель f3c53ca5e1
Коммит a11b57dc20
3 изменённых файлов: 11 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
image/test/mochitest/chrome.ini
Просмотреть файл

@ -7,16 +7,11 @@ support-files =
animated2.gif
animation.svg
animationPolling.js
bad.jpg
filter-final.svg
filter.svg
iframe.html
imgutils.js
invalid.jpg
lime100x100.svg
red.png
ref-iframe.html
rillybad.jpg
bug1132427.html
bug1132427.gif
@ -28,7 +23,6 @@ disabled = bug 1101415
skip-if = os != "win" || os_version == "6.2"
support-files =
bug415761.ico
[test_removal_onload.html]
[test_staticClone.html]
[test_svg_animatedGIF.html]
[test_svg_filter_animation.html]

2
image/test/mochitest/mochitest.ini
Просмотреть файл

@ -125,3 +125,5 @@ skip-if = buildapp == 'b2g' || os == 'android'
skip-if = buildapp == 'b2g' || os == 'android'
[test_removal_ondecode.html]
skip-if = buildapp == 'b2g' || os == 'android'
[test_removal_onload.html]
skip-if = buildapp == 'b2g' || os == 'android'

17
image/test/mochitest/test_removal_onload.html
Просмотреть файл

@ -5,10 +5,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=841579
-->
<head>
<title>Test for Bug 841579</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
<script type="application/javascript" src="imgutils.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=841579">Mozilla Bug 841579</a>
@ -19,12 +19,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=841579
<script type="application/javascript;version=1.8">
/** Test for Bug 841579**/
SimpleTest.requestFlakyTimeout("Early failure timeout");
SimpleTest.waitForExplicitFinish();
const FAILURE_TIMEOUT = 120000; // Fail early after 120 seconds (2 minutes)
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cc = SpecialPowers.Cc;
const Ci = SpecialPowers.Ci;
const gContent = document.getElementById("content");
var gImg;
@ -82,7 +83,7 @@ function cleanUpAndFinish() {
if (gIsTestFinished) {
return;
}
let imgLoadingContent = gImg.QueryInterface(Ci.nsIImageLoadingContent);
let imgLoadingContent = SpecialPowers.wrap(gImg).QueryInterface(Ci.nsIImageLoadingContent);
imgLoadingContent.removeObserver(gMyDecoderObserver);
// TODO: this isn't the case until post-bug 716140's refactorings
// ok(gNotifications == gLoads, "Should be notified the same number of times as loads");
@ -103,8 +104,8 @@ function main() {
observer.decodeComplete = onDecodeComplete;
gMyDecoderObserver =
Cc["@mozilla.org/image/tools;1"].getService(Ci.imgITools)
.createScriptedObserver(observer);
let imgLoadingContent = gImg.QueryInterface(Ci.nsIImageLoadingContent);
.createScriptedObserver(SpecialPowers.wrapCallbackObject(observer));
let imgLoadingContent = SpecialPowers.wrap(gImg).QueryInterface(Ci.nsIImageLoadingContent);
imgLoadingContent.addObserver(gMyDecoderObserver);
// We want to test the cold loading behavior, so clear cache in case an