Backed out changeset b8a9e34748f1 (bug 1130237) for m2 test failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 07 Dec 2015 11:20:35 +0100
changeset 309977 0e03498265086330fc1cad3c047105b46d4c6068
parent 309976 ba3bd2dae19a2c738baf7391bda17918f98599ea
child 309978 59bc3c7a83de7ffb611203912a7da6ad84535a5a
child 309979 051f3048f7e70db26fb618ea2b7efec05a307c54
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1130237
milestone45.0a1
backs outb8a9e34748f149884e4cfff694ed064d892e8c44
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 b8a9e34748f1 (bug 1130237) for m2 test failures
dom/media/mediasource/test/mochitest.ini
dom/media/mediasource/test/test_LoadedDataFired_mp4.html
--- a/dom/media/mediasource/test/mochitest.ini
+++ b/dom/media/mediasource/test/mochitest.ini
@@ -47,18 +47,16 @@ skip-if = (true || toolkit == 'android' 
 skip-if = (toolkit == 'android' || buildapp == 'mulet') || ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_DurationUpdated.html]
 [test_DurationUpdated_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_FrameSelection.html]
 [test_HaveMetadataUnbufferedSeek.html]
 [test_HaveMetadataUnbufferedSeek_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac") || (os == "win" && os_version == "6.1")) # Only supported on osx and vista+, disabling on win7 bug 1191138
-[test_LoadedDataFired_mp4.html]
-skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_LoadedMetadataFired.html]
 [test_LoadedMetadataFired_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_MediaSource.html]
 [test_MediaSource_memory_reporting.html]
 [test_MediaSource_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_MediaSource_disabled.html]
deleted file mode 100644
--- a/dom/media/mediasource/test/test_LoadedDataFired_mp4.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>MSE: Check that playback only starts once we have data at time = 0</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="mediasource.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-SimpleTest.waitForExplicitFinish();
-
-runWithMSE(function(ms, el) {
-  el.controls = true;
-  el.addEventListener("loadeddata", function() {
-    ok(el.buffered.length > 0, "data is buffered");
-    is(el.buffered.start(0), 0, "must fire loadeddata when data has been loaded");
-    is(el.currentTime, 0, "must fire loadeddata at start");
-  });
-  el.addEventListener("playing", function() {
-    ok(el.buffered.length > 0, "data is buffered");
-    is(el.buffered.start(0), 0, "must fire playing when data has been loaded");
-    is(el.currentTime, 0, "must fire playing at start");
-  });
-  once(ms, 'sourceopen').then(function() {
-    ok(true, "Receive a sourceopen event");
-    var videosb = ms.addSourceBuffer("video/mp4");
-    is(el.readyState, el.HAVE_NOTHING, "readyState is HAVE_NOTHING");
-    fetchAndLoad(videosb, 'bipbop/bipbop_video', ['init'], '.mp4')
-    .then(once.bind(null, el, "loadedmetadata"))
-    .then(function() {
-      videosb.appendWindowStart = 2;
-      videosb.appendWindowEnd = 4;
-      is(el.readyState, el.HAVE_METADATA, "readyState is HAVE_METADATA");
-      // Load [2.4, 3.968344). 2.4 as it's the first keyframe after 2s and
-      // 3.968344 as the last frame ends after 4s.
-      return fetchAndLoad(videosb, 'bipbop/bipbop_video', range(1, 8), '.m4s');
-    })
-    .then(function() {
-      is(el.readyState, el.HAVE_METADATA, "readyState is HAVE_METADATA");
-      // test that appendWindowEnd did its job.
-      ok(el.buffered.start(0) >= 2, "no data can be found prior appendWindowStart");
-      ok(el.buffered.end(el.buffered.length-1) <= 4, "no data can be found beyond appendWindowEnd");
-      el.play();
-      return once(el, "play");
-    })
-    .then(function() {
-      videosb.appendWindowStart = 0;
-      var promises = [];
-      // Load [0, 3.971666).
-      promises.push(fetchAndLoad(videosb, 'bipbop/bipbop_video', range(1, 8), '.m4s'));
-      // playback can only start now.
-      promises.push(once(el, "playing"));
-      return Promise.all(promises);
-    })
-    .then(function() {
-      ok(el.currentTime ==  0, "playing must start at 0");
-      ok(true, "playing");
-      SimpleTest.finish();
-    });
-  });
-});
-
-</script>
-</pre>
-</body>
-</html>