Backed out changeset 1978000eae5e (bug 1294605)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 20 Oct 2016 20:03:16 +0200
changeset 427698 45b00bb6727a744bdc733578297418df6c9b1b58
parent 427697 5a542246049e4ff7fc0c49234fdb49605047a8e2
child 427699 be887787de62889d8761e4402b320f351d571d23
push id33099
push userdholbert@mozilla.com
push dateThu, 20 Oct 2016 20:25:54 +0000
bugs1294605
milestone52.0a1
backs out1978000eae5e61f988e52516102530525a762a64
Backed out changeset 1978000eae5e (bug 1294605)
dom/media/tests/mochitest/mochitest.ini
dom/media/tests/mochitest/test_getUserMedia_trackCloneCleanup.html
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -75,17 +75,16 @@ skip-if = android_version == '18' # andr
 [test_getUserMedia_playVideoTwice.html]
 [test_getUserMedia_spinEventLoop.html]
 [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_trackCloneCleanup.html]
 [test_getUserMedia_trackEnded.html]
 [test_getUserMedia_peerIdentity.html]
 [test_peerConnection_addIceCandidate.html]
 [test_peerConnection_addtrack_removetrack_events.html]
 skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudio.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioNATSrflx.html]
deleted file mode 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_trackCloneCleanup.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <script type="application/javascript" src="mediaStreamPlayback.js"></script>
-</head>
-<body>
-<pre id="test">
-<script type="application/javascript">
-  "use strict";
-
-  createHTML({
-    title: "Stopping a MediaStreamTrack and its clones should deallocate the device",
-    bug: "1294605"
-  });
-
-  runTest(() => getUserMedia({audio: true, video: true}).then(stream => {
-    let clone = stream.clone();
-    stream.getTracks().forEach(t => t.stop());
-    stream.clone().getTracks().forEach(t => stream.addTrack(t));
-    is(stream.getTracks().filter(t => t.readyState == "live").length, 0,
-       "Cloning ended tracks should make them ended");
-    [...stream.getTracks(), ...clone.getTracks()].forEach(t => t.stop());
-
-    // Bug 1295352: better to be explicit about noGum here wrt future refactoring.
-    return noGum();
-  }));
-</script>
-</pre>
-</body>
-</html>