Backed out changeset e24de2c6fdb6 (bug 1208373)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 13 May 2016 13:51:48 +0200
changeset 297387 148472ab356d650de502f13cfa5cae5192799503
parent 297386 54e742653c70283be5fdf93e8111e534149c380c
child 297388 75157b3d99034a04be7e5500296ac78f54546f52
push id19218
push userkwierso@gmail.com
push dateFri, 13 May 2016 23:46:15 +0000
treeherderfx-team@93d60e9db618 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1208373
milestone49.0a1
backs oute24de2c6fdb6a3158f69d9a47d3a93bf3b8bb3a5
Backed out changeset e24de2c6fdb6 (bug 1208373)
dom/media/tests/mochitest/mochitest.ini
dom/media/tests/mochitest/test_getUserMedia_trackEnded.html
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -73,17 +73,16 @@ skip-if = toolkit == 'gonk' || buildapp 
 [test_getUserMedia_spinEventLoop.html]
 skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # copied from basicAudio
 [test_getUserMedia_stopAudioStream.html]
 [test_getUserMedia_stopAudioStreamWithFollowupAudio.html]
 [test_getUserMedia_stopVideoAudioStream.html]
 [test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html]
 [test_getUserMedia_stopVideoStream.html]
 [test_getUserMedia_stopVideoStreamWithFollowupVideo.html]
-[test_getUserMedia_trackEnded.html]
 [test_getUserMedia_peerIdentity.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 1021776, too --ing slow on b2g)
 [test_peerConnection_addIceCandidate.html]
 [test_peerConnection_addTrack.html]
 [test_peerConnection_basicAudio.html]
 skip-if = toolkit == 'gonk' # B2G emulator is too slow to handle a two-way audio call reliably
 [test_peerConnection_basicAudioNATSrflx.html]
 skip-if = toolkit == 'gonk' || toolkit == 'android' # B2G emulator is too slow to handle a two-way audio call reliably, websockets don't work on android (bug 1266217)
deleted file mode 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_trackEnded.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <script type="application/javascript" src="mediaStreamPlayback.js"></script>
-</head>
-<body>
-<pre id="test">
-<iframe id="iframe" srcdoc="
-  <script type='application/javascript'>
-  document.gUM = (constraints, success, failure) =>
-    navigator.mediaDevices.getUserMedia(constraints).then(success, failure);
-  </script>">
-</iframe>
-<script type="application/javascript">
-  "use strict";
-
-  createHTML({
-    title: "getUserMedia MediaStreamTrack 'ended' event on navigating",
-    bug: "1208373",
-  });
-
-  runTest(() => {
-    let iframe = document.getElementById("iframe");
-    let stream;
-    // We're passing callbacks into a method in the iframe here, because
-    // a Promise created in the iframe is unusable after the iframe has
-    // navigated away (see bug 1269400 for details).
-    return new Promise((resolve, reject) =>
-        iframe.contentDocument.gUM({audio: true, video: true}, resolve, reject))
-      .then(s => stream = s)
-      .then(() => {
-        var allTracksEnded = Promise.all(stream.getTracks().map(t => {
-          info("Set up ended handler for track " + t.id);
-          return haveEvent(t, "ended", wait(5000))
-            .then(event => {
-              info("ended handler invoked for track " + t.id);
-              is(event.target, t, "Target should be correct");
-            }, e => e ? Promise.reject(e)
-                      : ok(false, "ended event never raised for track " + t.id));
-        }));
-        stream.getTracks().forEach(t =>
-          is(t.readyState, "live",
-             "Non-ended track should have readyState 'live'"));
-        iframe.srcdoc = "";
-        info("iframe has been reset. Waiting for tracks to end.");
-        return allTracksEnded;
-      })
-      .then(() => stream.getTracks().forEach(t =>
-        is(t.readyState, "ended",
-           "Ended track should have readyState 'ended'")));
-  });
-</script>
-</pre>
-</body>
-</html>