Backed out 2 changesets (bug 1294358) for xp mda failures a=backout CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Wed, 17 Aug 2016 10:06:40 -0700
changeset 309898 cc222be2b97bff7edc94ce35578efad68731e1cc
parent 309897 f04d86773cb31d586d825fff6c36b90f4c02f78f
child 309899 b25d09b7fab57ddb82f14916a443eb34fda31137
push id80700
push userkwierso@gmail.com
push dateThu, 18 Aug 2016 00:25:37 +0000
treeherdermozilla-inbound@df38e89c5720 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1294358
milestone51.0a1
backs out886441076b5ff512a0406f38825adac5fa1bf887
848141457f25a977ffc41f8dd1f0ca2c30977d50
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 2 changesets (bug 1294358) for xp mda failures a=backout CLOSED TREE Backed out changeset 886441076b5f (bug 1294358) Backed out changeset 848141457f25 (bug 1294358)
dom/media/test/gizmo-noaudio.mp4
dom/media/test/gizmo-noaudio.mp4^headers^
dom/media/test/manifest.js
dom/media/test/mochitest.ini
dom/media/test/test_background_video_no_suspend_short_vid.html
dom/media/test/test_background_video_suspend.html
dom/media/test/test_background_video_suspend_ends.html
deleted file mode 100644
index 24732a4064e330ae162b3b4b8c1bb5fb905a927e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/media/test/gizmo-noaudio.mp4^headers^
+++ /dev/null
@@ -1,1 +0,0 @@
-Cache-Control: no-store
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -1405,23 +1405,16 @@ var gEMENonMSEFailTests = [
   {
     name:"short-cenc.mp4",
     audioType:"audio/mp4; codecs=\"mp4a.40.2\"",
     videoType:"video/mp4; codecs=\"avc1.64000d\"",
     duration:0.47,
   },
 ];
 
-// These are files that are used for video decode suspend in
-// background tabs tests.
-var gDecodeSuspendTests = [
-  { name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
-  { name:"gizmo-noaudio.mp4", type:"video/mp4", duration:5.56 }
-];
-
 function checkMetadata(msg, e, test) {
   if (test.width) {
     is(e.videoWidth, test.width, msg + " video width");
   }
   if (test.height) {
     is(e.videoHeight, test.height, msg + " video height");
   }
   if (test.duration) {
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -410,18 +410,16 @@ support-files =
   dynamic_redirect.sjs
   dynamic_resource.sjs
   eme.js
   file_access_controls.html
   fragment_noplay.js
   fragment_play.js
   gizmo.mp4
   gizmo.mp4^headers^
-  gizmo-noaudio.mp4
-  gizmo-noaudio.mp4^headers^
   huge-id3.mp3
   huge-id3.mp3^headers^
   id3tags.mp3
   id3tags.mp3^headers^
   invalid-cmap-s0c0.opus
   invalid-cmap-s0c0.opus^headers^
   invalid-cmap-s0c2.opus
   invalid-cmap-s0c2.opus^headers^
@@ -882,15 +880,16 @@ tags = webvtt
 # The tests below contain backend-specific tests. Write backend independent
 # tests rather than adding to this list.
 [test_can_play_type_webm.html]
 [test_can_play_type_wave.html]
 [test_fragment_noplay.html]
 [test_fragment_play.html]
 
 [test_background_video_suspend.html]
-tags = suspend
-[test_background_video_suspend_ends.html]
+skip-if = (os == 'win' && os_version == '5.1')
 tags = suspend
 [test_background_video_no_suspend_short_vid.html]
+skip-if = (os == 'win' && os_version == '5.1')
 tags = suspend
 [test_background_video_no_suspend_disabled.html]
+skip-if = (os == 'win' && os_version == '5.1')
 tags = suspend
--- a/dom/media/test/test_background_video_no_suspend_short_vid.html
+++ b/dom/media/test/test_background_video_no_suspend_short_vid.html
@@ -16,17 +16,17 @@ var manager = new MediaTestManager;
 startTest({
   desc: "Test Background Video Doesn't Suspend When Timeout Is Longer Than Video.",
   prefs: [
     [ 'media.test.setVisible', true ],
     [ 'media.suspend-bkgnd-video.enabled', true ],
     // Gizmo.mp4 is about 5.6s
     [ 'media.suspend-bkgnd-video.delay-ms', 10000 ]
   ],
-  tests: gDecodeSuspendTests,
+  tests: [ { name: "gizmo.mp4" } ],
   runTest: (test, token) => {
     let v = appendVideoToDoc(test.name, token);
     manager.started(token);
 
     /* This test checks that suspend doesn't occur when the delay is longer
        than the duration of the video that's playing */
     waitUntilPlaying(v)
       .then(() => checkVideoDoesntSuspend(v))
--- a/dom/media/test/test_background_video_suspend.html
+++ b/dom/media/test/test_background_video_suspend.html
@@ -23,17 +23,17 @@ startTest({
   desc: 'Test Background Video Suspends',
   prefs: [
     [ "media.test.setVisible", true ],
     [ "media.suspend-bkgnd-video.enabled", true ],
     // User a short delay to ensure video decode suspend happens before end
     // of video.
     [ "media.suspend-bkgnd-video.delay-ms", 1000 ]
   ],
-  tests: gDecodeSuspendTests,
+  tests: [ { name: "gizmo.mp4" } ],
   runTest: (test, token) => {
     let v = appendVideoToDoc(test.name, token);
     manager.started(token);
 
     let start;
     waitUntilPlaying(v)
       .then(() => { start = performance.now(); })
       .then(() => testVideoSuspendsWhenHidden(v))
deleted file mode 100644
--- a/dom/media/test/test_background_video_suspend_ends.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test Background Suspended Video Fires 'ended' Event</title>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<script src="manifest.js"></script>
-<script src="background_video.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
-<p id="display">
-<div id="content" style="display: none"></div>
-<pre id="test">
-<script type="text/javascript">
-"use strict";
-
-var manager = new MediaTestManager;
-
-startTest({
-  desc: "Test Background Suspended Video Fires 'ended' Event",
-  prefs: [
-    [ "media.test.setVisible", true ],
-    [ "media.suspend-bkgnd-video.enabled", true ],
-    // User a short delay to ensure video decode suspend happens before end
-    // of video.
-    [ "media.suspend-bkgnd-video.delay-ms", 1000 ]
-  ],
-  tests: gDecodeSuspendTests,
-  runTest: (test, token) => {
-    let v = appendVideoToDoc(test.name, token);
-    manager.started(token);
-
-    // This test checks that 'ended' event is received for videos with
-    // suspended video decoding. This is important for looping video logic
-    // handling in HTMLMediaElement.
-    waitUntilPlaying(v)
-      .then(() => testVideoSuspendsWhenHidden(v))
-      .then(() => waitUntilEnded(v))
-      .then(() => {
-        ok(v.currentTime >= v.duration, 'current time approximates duration.');
-        manager.finished(token);
-      });
-  }
-});
-</script>
-</pre>