Bug 721589 - Fix intermittent orange in image/test/mochitest/test_error_events.html. r=joe
authorJustin Lebar <justin.lebar@gmail.com>
Fri, 27 Jan 2012 09:23:00 -0500
changeset 85600 9a36661ced48f51080a15b06b0c308a520cb584f
parent 85599 7d5a6dae7d76cae7cf7729a4ad7296389c805746
child 85601 f5784f097de32f145f3d028e9112894e7cf8c218
push id21940
push userjdrew@mozilla.com
push dateSun, 29 Jan 2012 02:43:03 +0000
treeherdermozilla-central@ec666b4c8d84 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs721589
milestone12.0a1
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
Bug 721589 - Fix intermittent orange in image/test/mochitest/test_error_events.html. r=joe
image/test/mochitest/Makefile.in
image/test/mochitest/error-late.png
image/test/mochitest/test_error_events.html
--- a/image/test/mochitest/Makefile.in
+++ b/image/test/mochitest/Makefile.in
@@ -83,17 +83,16 @@ include $(topsrcdir)/config/rules.mk
                 test_bug552605-1.html \
                 test_bug552605-2.html \
                 bug552605.sjs \
                 bug671906-iframe.html \
                 bug671906.sjs \
                 test_bug671906.html \
 		test_error_events.html \
 		error-early.png \
-		error-late.png \
                 $(NULL)
 
 # Tests disabled due to intermittent orange
 # test_bug435296.html disabled - See bug 578591
 # test_bug478398.html disabled - See bug 579139
 
 _CHROME_FILES = imgutils.js \
                 animationPolling.js \
deleted file mode 100644
index bfae57cf23b637809861378e9d916829998e5796..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/image/test/mochitest/test_error_events.html
+++ b/image/test/mochitest/test_error_events.html
@@ -9,45 +9,42 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 
 <!-- Test for Bug 715308 comment 93:
 
   - For a valid image, onload is fired and onerror is never fired.
-
-  - For an image with errors (either early or late in the image data), onerror
-    is fired, but onload is never fired.
-
+  - For an image with errors, onerror is fired, but onload is never fired.
   - For any image, either onload or onerror is fired, but never both.
 
  -->
 <script type="text/javascript;version=1.8">
 "use strict";
 
 SimpleTest.waitForExplicitFinish();
 
 var numCallbacks = 0;
 
 function image_error(name)
 {
   numCallbacks++;
-  ok(name == 'error-early' || name == 'error-late', "Got onerror for " + name);
+  ok(name == 'error-early', "Got onerror for " + name);
 }
 
 function image_load(name)
 {
   numCallbacks++;
   ok(name == 'shaver', "Got onload for " + name);
 }
 
 function page_load()
 {
-  ok(numCallbacks == 3, 'Got page load before all onload/onerror callbacks?');
+  ok(numCallbacks == 2, 'Got page load before all onload/onerror callbacks?');
 
   // Spin the event loop a few times to let image_error run if it's going to,
   // then finish the test.
   SimpleTest.executeSoon(function() {
     SimpleTest.executeSoon(function() {
       SimpleTest.executeSoon(function() {
         SimpleTest.finish();
       });
@@ -57,19 +54,14 @@ function page_load()
 
 addEventListener('load', page_load);
 
 </script>
 
 <div id="content">
   <img src='shaver.png' onerror='image_error("shaver")' onload='image_load("shaver")'>
   <img src='error-early.png' onerror='image_error("error-early")' onload='image_load("error-early")'>
-
-  <!-- This image has invalid data (hopefully triggering a decode error)
-       relatively late in the bitstream.  Compare to shaver.png with a binary
-       diff tool. -->
-  <img src='error-late.png' onerror='image_error("error-late")' onload='image_load("error-late")'>
 </div>
 
 </pre>
 </body>
 </html>