| author | Carsten "Tomcat" Book <cbook@mozilla.com> |
| Thu, 09 Jun 2016 15:18:49 +0200 | |
| changeset 301295 | ff6dd61ac5230a4d26c6199774e2adf2659c44c2 |
| parent 301294 | d0b15328a1931e343152f6bf791e501767bc8389 |
| child 301296 | b7602995ca0f432feee77356f46102779ab02f5f |
| push id | 78275 |
| push user | cbook@mozilla.com |
| push date | Thu, 09 Jun 2016 13:19:23 +0000 |
| treeherder | mozilla-inbound@df403befe9fe [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| bugs | 1208373 |
| milestone | 50.0a1 |
| backs out | 1a53787bf0f7580e8d06cbb5e2b4142490aaf9a4 |
| 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
|
| dom/media/tests/mochitest/mochitest.ini | file | annotate | diff | comparison | revisions | |
| dom/media/tests/mochitest/test_getUserMedia_trackEnded.html | file | annotate | diff | comparison | revisions |
--- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -74,17 +74,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_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) [test_peerConnection_basicAudioNATRelay.html]
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>