Bug 1021677 - enable test_media_selection.html on B2G. r=cpearce
authorJW Wang <jwwang@mozilla.com>
Tue, 07 Oct 2014 20:06:00 +0200
changeset 209543 04c4748eed16c5ca1e6b877b36d5639c2db930f3
parent 209542 883279fdc2c6e4b4e00bf81c5647fc357c083fde
child 209544 e5883dd2d69e2b9fdb9c8a6dc1b9354c201edae4
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerscpearce
bugs1021677
milestone35.0a1
Bug 1021677 - enable test_media_selection.html on B2G. r=cpearce
content/media/test/mochitest.ini
content/media/test/test_media_selection.html
--- a/content/media/test/mochitest.ini
+++ b/content/media/test/mochitest.ini
@@ -362,17 +362,16 @@ skip-if = toolkit == 'android' # bug 608
 [test_invalid_reject_play.html]
 [test_invalid_seek.html]
 [test_load.html]
 [test_load_candidates.html]
 [test_load_same_resource.html]
 [test_load_source.html]
 [test_loop.html]
 [test_media_selection.html]
-skip-if = toolkit == 'gonk' && !debug # bug 1021677
 [test_media_sniffer.html]
 [test_mediarecorder_avoid_recursion.html]
 [test_mediarecorder_creation.html]
 [test_mediarecorder_creation_fail.html]
 [test_mediarecorder_getencodeddata.html]
 [test_mediarecorder_record_4ch_audiocontext.html]
 [test_mediarecorder_record_audiocontext.html]
 [test_mediarecorder_record_audiocontext_mlk.html]
--- a/content/media/test/test_media_selection.html
+++ b/content/media/test/test_media_selection.html
@@ -4,16 +4,21 @@
   <title>Media test: media selection</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="application/javascript" src="manifest.js"></script>
 </head>
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
+//longer timeout for sometimes B2G emulator runs very slowly
+if (SpecialPowers.Services.appinfo.name == "B2G") {
+  SimpleTest.requestLongerTimeout(3);
+}
+
 var manager = new MediaTestManager;
 
 function maketest(attach_media, name, type, check_metadata) {
   return function (token) {
     var e = document.createElement('video');
     e.preload = "metadata";
     manager.started(token);
     var errorRun = false;