Backed out changeset 22150caec0d2 (bug 1208328)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 09 Jun 2016 15:18:33 +0200
changeset 301284 e2faf882fda642eede81b437ea83ca6643af04fb
parent 301283 65489e333cdb4a9b12d93ab273cad6e5b69aae11
child 301285 ccfe094e3fdc392f19dcff0c2616b367b6ac1b85
push id78275
push usercbook@mozilla.com
push dateThu, 09 Jun 2016 13:19:23 +0000
treeherdermozilla-inbound@df403befe9fe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1208328
milestone50.0a1
backs out22150caec0d26f651b8c9bf0e17190c4b386f4bf
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
Backed out changeset 22150caec0d2 (bug 1208328)
dom/media/tests/mochitest/mochitest.ini
dom/media/tests/mochitest/test_getUserMedia_addtrack_removetrack_events.html
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -39,17 +39,16 @@ skip-if = toolkit == 'gonk' || buildapp 
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g emulator seems to be too slow (Bug 1016498 and 1008080)
 [test_dataChannel_noOffer.html]
 [test_enumerateDevices.html]
 skip-if = buildapp == 'mulet'
 [test_getUserMedia_audioCapture.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g emulator seems to be too slow (Bug 1016498 and 1008080), android(Bug 1189784, timeouts on 4.3 emulator)
 [test_getUserMedia_addTrackRemoveTrack.html]
 skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure
-[test_getUserMedia_addtrack_removetrack_events.html]
 [test_getUserMedia_basicAudio.html]
 skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure
 [test_getUserMedia_basicVideo.html]
 skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure
 [test_getUserMedia_basicVideo_playAfterLoadedmetadata.html]
 skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure
 [test_getUserMedia_basicScreenshare.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' # no screenshare on b2g/android # Bug 1141029 Mulet parity with B2G Desktop for TC
deleted file mode 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_addtrack_removetrack_events.html
+++ /dev/null
@@ -1,104 +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: "MediaStream's 'addtrack' and 'removetrack' events shouldn't fire on manual operations",
-  bug: "1208328"
-});
-
-var spinEventLoop = () => new Promise(r => setTimeout(r, 0));
-
-var stream;
-var clone;
-var newStream;
-
-var addTrack = track => {
-  info("Adding track " + track.id);
-  stream.addTrack(track);
-};
-var removeTrack = track => {
-  info("Removing track " + track.id);
-  stream.removeTrack(track);
-};
-var stopTrack = track => {
-  if (track.readyState == "live") {
-    info("Stopping track " + track.id);
-  }
-  track.stop();
-};
-
-runTest(() => getUserMedia({audio: true, video: true})
-  .then(s => {
-    stream = s;
-    clone = s.clone();
-    stream.addEventListener("addtrack", function onAddtrack(event) {
-      ok(false, "addtrack fired unexpectedly for track " + event.track.id);
-    });
-    stream.addEventListener("removetrack", function onRemovetrack(event) {
-      ok(false, "removetrack fired unexpectedly for track " + event.track.id);
-    });
-
-    return getUserMedia({audio: true, video: true});
-  })
-  .then(s => {
-    newStream = s;
-
-    info("Stopping an original track");
-    stopTrack(stream.getTracks()[0]);
-
-    return spinEventLoop();
-  })
-  .then(() => {
-    info("Removing original tracks");
-    stream.getTracks().forEach(t => stream.removeTrack(t));
-
-    return spinEventLoop();
-  })
-  .then(() => {
-    info("Adding other gUM tracks");
-    newStream.getTracks().forEach(t => addTrack(t))
-
-    return spinEventLoop();
-  })
-  .then(() => {
-    info("Adding cloned tracks");
-    let clone = stream.clone();
-    clone.getTracks().forEach(t => addTrack(t));
-
-    return spinEventLoop();
-  })
-  .then(() => {
-    info("Removing a clone");
-    removeTrack(clone.getTracks()[0]);
-
-    return spinEventLoop();
-  })
-  .then(() => {
-    info("Stopping clones");
-    clone.getTracks().forEach(t => stopTrack(t));
-
-    return spinEventLoop();
-  })
-  .then(() => {
-    info("Stopping originals");
-    stream.getTracks().forEach(t => stopTrack(t));
-
-    return spinEventLoop();
-  })
-  .then(() => {
-    info("Removing remaining tracks");
-    stream.getTracks().forEach(t => removeTrack(t));
-
-    return spinEventLoop();
-  }));
-</script>
-</pre>
-</body>
-</html>