Backed out changeset fdbc50946db3 (bug 1223297) for test failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 02 Dec 2015 11:56:45 +0100
changeset 309151 a8e464c7dc5c65f66d5d02cf55d66291227e0671
parent 309150 062c61ca314c990a5828a00b7c63883e7cc1639a
child 309152 5ddb8daacf7e5908c27ce93cfa0a8293f07ffd6a
child 309314 f25bb7d9a0a1f68234fd9a10aa50d76d610092e4
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)
bugs1223297
milestone45.0a1
backs outfdbc50946db383b689c98ba2a6d6c4b8451743e0
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 fdbc50946db3 (bug 1223297) for test failures
dom/browser-element/mochitest/audio.ogg
dom/browser-element/mochitest/browserElement_MultipleAudioChannels.js
dom/browser-element/mochitest/chrome.ini
dom/browser-element/mochitest/file_browserElement_MultipleAudioChannels.html
dom/browser-element/mochitest/mochitest.ini
dom/browser-element/mochitest/multipleAudioChannels_manifest.webapp
dom/browser-element/mochitest/multipleAudioChannels_manifest.webapp^headers^
dom/browser-element/mochitest/test_browserElement_MultipleAudioChannels.html
deleted file mode 100644
index d7f6a0ccf47fbc30e936b47e3f4d2cf8f4a90a16..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/browser-element/mochitest/browserElement_MultipleAudioChannels.js
+++ /dev/null
@@ -1,134 +0,0 @@
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-var tests = [false /* INPROC */, true /* OOP */];
-var rootURI = "http://test/chrome/dom/browser-element/mochitest/";
-var manifestURI = rootURI + "multipleAudioChannels_manifest.webapp";
-var srcURI = rootURI +  "file_browserElement_MultipleAudioChannels.html";
-var generator = startTest();
-var app = null;
-var channelsNum = 2;
-
-addLoadEvent(() => {
-  SpecialPowers.pushPermissions(
-    [{ "type": "webapps-manage", "allow": 1, "context": document },
-     { "type": "browser", "allow": 1, "context": document },
-     { "type": "embed-apps", "allow": 1, "context": document }],
-    function() {
-      SpecialPowers.pushPrefEnv(
-        {'set': [["dom.mozBrowserFramesEnabled", true],
-                 ["dom.webapps.useCurrentProfile", true],
-                 ["media.useAudioChannelAPI", true]]},
-        () => { generator.next(); })
-    });
-});
-
-function error(message) {
-  ok(false, message);
-  SimpleTest.finish();
-}
-
-function continueTest() {
-  try {
-    generator.next();
-  } catch (e if e instanceof StopIteration) {
-    error("Stop test because of exception!");
-  }
-}
-
-function showTestInfo(aOOPCEnabled) {
-  if (aOOPCEnabled) {
-    info("=== Start OOP testing ===");
-  } else {
-    info("=== Start INPROC testing ===");
-  }
-}
-
-function uninstallApp(aApp) {
-  if (aApp) {
-    var request = navigator.mozApps.mgmt.uninstall(app);
-    app = null;
-    request.onerror = () => {
-      error("Uninstall app failed!");
-    };
-    request.onsuccess = () => {
-      is(request.result, manifestURI, "App uninstalled.");
-      runNextTest();
-    }
-  }
-}
-
-function runTest(aOOPCEnabled) {
-  var request = navigator.mozApps.install(manifestURI, {});
-  request.onerror = () => {
-    error("Install app failed!");
-  };
-
-  request.onsuccess = () => {
-    app = request.result;
-    ok(app, "App is installed.");
-    is(app.manifestURL, manifestURI, "App manifest url is correct.");
-
-    var iframe = document.createElement('iframe');
-    iframe.setAttribute('mozbrowser', true);
-    iframe.setAttribute('remote', aOOPCEnabled);
-    iframe.setAttribute('mozapp', manifestURI);
-    iframe.src = srcURI;
-    document.body.appendChild(iframe);
-
-    iframe.addEventListener('mozbrowserloadend', () => {
-      var channels = iframe.allowedAudioChannels;
-      is(channels.length, channelsNum, "Have two channels.");
-
-      var activeCounter = 0;
-      for (var idx = 0; idx < channelsNum; idx++) {
-        let ac = channels[idx];
-        ok(ac instanceof BrowserElementAudioChannel, "Correct class.");
-        ok("getMuted" in ac, "ac.getMuted exists");
-        ok("onactivestatechanged" in ac, "ac.onactivestatechanged exists");
-
-        if (ac.name == "normal" || ac.name == "content") {
-          ok(true, "Get correct channel type.");
-        } else {
-          error("Get unexpected channel type!");
-        }
-
-        ac.getMuted().onsuccess = (e) => {
-          is(e.target.result, false, "Channel is unmuted.")
-        }
-
-        ac.onactivestatechanged = () => {
-          ok(true, "Receive activestatechanged event from " + ac.name);
-          ac.onactivestatechanged = null;
-          if (++activeCounter == channelsNum) {
-            uninstallApp(app);
-            document.body.removeChild(iframe);
-          }
-        };
-      }
-    });
-  };
-}
-
-function runNextTest() {
-  if (tests.length) {
-    var isEnabledOOP = tests.shift();
-    showTestInfo(isEnabledOOP);
-    runTest(isEnabledOOP);
-  } else {
-    SimpleTest.finish();
-  }
-}
-
-function startTest() {
-  SpecialPowers.setAllAppsLaunchable(true);
-  SpecialPowers.autoConfirmAppInstall(continueTest);
-  yield undefined;
-
-  SpecialPowers.autoConfirmAppUninstall(continueTest);
-  yield undefined;
-
-  runNextTest();
-  yield undefined;
-}
--- a/dom/browser-element/mochitest/chrome.ini
+++ b/dom/browser-element/mochitest/chrome.ini
@@ -1,16 +1,10 @@
 [DEFAULT]
 skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
 
 support-files =
-  audio.ogg
-  browserElement_MultipleAudioChannels.js
   browserElement_NotifyChannel.js
-  file_browserElement_MultipleAudioChannels.html
   file_browserElement_NotifyChannel.html
   manifest.webapp
   manifest.webapp^headers^
-  multipleAudioChannels_manifest.webapp
-  multipleAudioChannels_manifest.webapp^headers^
 
-[test_browserElement_MultipleAudioChannels.html]
 [test_browserElement_NotifyChannel.html]
\ No newline at end of file
deleted file mode 100644
--- a/dom/browser-element/mochitest/file_browserElement_MultipleAudioChannels.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<body>
-<script>
-var audio1 = new Audio("audio.ogg");
-var audio2 = new Audio("audio.ogg");
-audio2.mozAudioChannelType = "content";
-
-audio1.play();
-audio2.play();
-</script>
-</body>
-</html>
--- a/dom/browser-element/mochitest/mochitest.ini
+++ b/dom/browser-element/mochitest/mochitest.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s
 support-files =
-  audio.ogg
+  ../../../browser/base/content/test/general/audio.ogg
   ../../../dom/media/test/short-video.ogv
   async.js
   browserElementTestHelpers.js
   browserElement_Alert.js
   browserElement_AlertInFrame.js
   browserElement_AllowEmbedAppsInNestedOOIframe.js
   browserElement_AppFramePermission.js
   browserElement_AppWindowNamespace.js
deleted file mode 100644
--- a/dom/browser-element/mochitest/multipleAudioChannels_manifest.webapp
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "Multiple audio channels test",
-  "launch_path": "/index.html",
-  "permissions": {
-    "audio-channel-content": {}
-  }
-}
deleted file mode 100644
--- a/dom/browser-element/mochitest/multipleAudioChannels_manifest.webapp^headers^
+++ /dev/null
@@ -1,1 +0,0 @@
-Content-Type: application/manifest+json
\ No newline at end of file
deleted file mode 100644
--- a/dom/browser-element/mochitest/test_browserElement_MultipleAudioChannels.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for multiple audio channels.</title>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/chrome-harness.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<script type="application/javascript;version=1.7" src="browserElement_MultipleAudioChannels.js">
-</script>
-</body>
-</html>