Bug 1274104 part 4 - Move test_videocontrols back to normal mochitest. r=jaws
authorXidorn Quan <me@upsuper.org>
Tue, 24 May 2016 13:21:22 +1000
changeset 327537 4326af8f70cd3bbefb38b3d1b9faab4e4aef3fc1
parent 327536 834445b4a5f1a16dce6504cd7bb8b6f624f30be6
child 327538 e4a7e67e0fe50970d559eab440f0643799eb719d
push idunknown
push userunknown
push dateunknown
reviewersjaws
bugs1274104, 694696
milestone49.0a1
Bug 1274104 part 4 - Move test_videocontrols back to normal mochitest. r=jaws There was some mistake in patch of bug 694696 which incorrectly added 'skip-if' for some unrelated test. This patch reverts those mistakes in addition to just moving the test back. It also attaches the "fullscreen" tag to the test as it triggers that. MozReview-Commit-ID: 2PMX6PFZWm2
toolkit/content/tests/widgets/chrome.ini
toolkit/content/tests/widgets/mochitest.ini
toolkit/content/tests/widgets/test_videocontrols.html
--- a/toolkit/content/tests/widgets/chrome.ini
+++ b/toolkit/content/tests/widgets/chrome.ini
@@ -1,21 +1,18 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   tree_shared.js
   popup_shared.js
   window_menubar.xul
-  seek_with_sound.ogg
 
 [test_contextmenu_nested.xul]
 skip-if = os == 'linux' # Bug 1116215
 [test_contextmenu_menugroup.xul]
 skip-if = os == 'linux' # Bug 1115088
 [test_editor_currentURI.xul]
 [test_menubar.xul]
 skip-if = os == 'mac'
 [test_popupanchor.xul]
 skip-if = os == 'android'
 [test_popupreflows.xul]
 [test_tree_column_reorder.xul]
-skip-if = toolkit == 'android'
-[test_videocontrols.html]
--- a/toolkit/content/tests/widgets/mochitest.ini
+++ b/toolkit/content/tests/widgets/mochitest.ini
@@ -19,16 +19,18 @@ support-files =
   videocontrols_direction-2d.html
   videocontrols_direction-2e.html
   videocontrols_direction_test.js
   videomask.css
 
 [test_audiocontrols_dimensions.html]
 skip-if = toolkit == 'android'
 [test_mousecapture_area.html]
+[test_videocontrols.html]
+tags = fullscreen
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_videocontrols_audio.html]
 [test_videocontrols_audio_direction.html]
 [test_videocontrols_jsdisabled.html]
 skip-if = toolkit == 'android' # bug 1272646
 [test_videocontrols_standalone.html]
 skip-if = toolkit == 'android' # bug 1075573
 [test_videocontrols_video_direction.html]
--- a/toolkit/content/tests/widgets/test_videocontrols.html
+++ b/toolkit/content/tests/widgets/test_videocontrols.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Video controls test</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <p id="display"></p>
 
 <div id="content">
   <video width="320" height="240" id="video" controls mozNoDynamicControls preload="auto"></video>
 </div>