Bug 1261158 - Convert test_changeOfSource2.html to a mochitest-plain. r=tnikkel a=test-only
authorKartikaya Gupta <kgupta@mozilla.com>
Mon, 04 Apr 2016 16:27:58 -0400
changeset 323789 1c55cc5933248908b36214c70171763f69475ae0
parent 323788 aa82e041e1f449bb52b661c87df846f336e21c9d
child 323790 52e8688505bfd726ef525ed42f64446173a4f3e0
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstnikkel, test-only
bugs1261158
milestone47.0a2
Bug 1261158 - Convert test_changeOfSource2.html to a mochitest-plain. r=tnikkel a=test-only MozReview-Commit-ID: 9mdR16WzTkU
image/test/mochitest/chrome.ini
image/test/mochitest/mochitest.ini
image/test/mochitest/test_changeOfSource2.html
--- a/image/test/mochitest/chrome.ini
+++ b/image/test/mochitest/chrome.ini
@@ -1,31 +1,29 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   animated-gif-finalframe.gif
   animated-gif.gif
-  animated-gif2.gif
   animated1.gif
   animated2.gif
   animation.svg
   animationPolling.js
   bad.jpg
   damon.jpg
   filter-final.svg
   filter.svg
   first-frame-padding.gif
   ico-bmp-opaque.ico
   ico-bmp-transparent.ico
   iframe.html
   imgutils.js
   invalid.jpg
   lime100x100.svg
   opaque.bmp
-  purple.gif
   red.gif
   red.png
   ref-iframe.html
   rillybad.jpg
   transparent.gif
   transparent.png
   bug1132427.html
   bug1132427.gif
@@ -33,17 +31,16 @@ support-files =
 [test_animation.html]
 disabled = bug 1100497
 [test_animation2.html]
 disabled = bug 1101415
 [test_bug415761.html]
 skip-if = os != "win" || os_version == "6.2"
 support-files =
   bug415761.ico
-[test_changeOfSource2.html]
 [test_has_transparency.html]
 [test_net_failedtoprocess.html]
 [test_removal_ondecode.html]
 [test_removal_onload.html]
 [test_staticClone.html]
 [test_svg_animatedGIF.html]
 [test_svg_filter_animation.html]
 [test_synchronized_animation.html]
--- a/image/test/mochitest/mochitest.ini
+++ b/image/test/mochitest/mochitest.ini
@@ -46,16 +46,17 @@ support-files =
   grey.png
   imgutils.js
   invalid.jpg
   keep.gif
   keep.png
   lime100x100.svg
   lime-anim-100x100.svg
   lime-anim-100x100-2.svg
+  purple.gif
   red.png
   restore-previous.gif
   restore-previous.png
   rillybad.jpg
   schrep.png
   shaver.png
   short_header.gif
   source.png
@@ -110,8 +111,10 @@ skip-if = buildapp == 'b2g' || os == 'an
 [test_animSVGImage2.html]
 skip-if = buildapp == 'b2g' || os == 'android'
 [test_background_image_anim.html]
 skip-if = buildapp == 'b2g' || os == 'android'
 [test_bullet_animation.html]
 skip-if = buildapp == 'b2g' || os == 'android'
 [test_changeOfSource.html]
 skip-if = buildapp == 'b2g' || os == 'android'
+[test_changeOfSource2.html]
+skip-if = buildapp == 'b2g' || os == 'android'
--- a/image/test/mochitest/test_changeOfSource2.html
+++ b/image/test/mochitest/test_changeOfSource2.html
@@ -1,21 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=666446
 -->
 <head>
   <title>Test for Bug 691792 - Change of Source (2nd Version)</title>
-  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
-  <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>
   <script type="application/javascript" src="animationPolling.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=691792">
 Mozilla Bug 691792: Change of src attribute for animated gifs no longer works as expected
 </a>
 <p id="display"></p>
 
 <div id="content">