Bug 1343749. Part 3 - SimpleTest.js must be loaded before manifest.js which depends on SimpleTest. r?jib
MozReview-Commit-ID: F46BOyRKCmh
--- a/dom/media/tests/mochitest/pc.js
+++ b/dom/media/tests/mochitest/pc.js
@@ -1875,16 +1875,17 @@ PeerConnectionWrapper.prototype = {
}
};
// haxx to prevent SimpleTest from failing at window.onload
function addLoadEvent() {}
var scriptsReady = Promise.all([
"/tests/SimpleTest/SimpleTest.js",
+ "../../test/manifest.js",
"head.js",
"templates.js",
"turnConfig.js",
"dataChannel.js",
"network.js",
"sdpUtils.js"
].map(script => {
var el = document.createElement("script");
--- a/dom/media/tests/mochitest/test_peerConnection_capturedVideo.html
+++ b/dom/media/tests/mochitest/test_peerConnection_capturedVideo.html
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
<html>
<head>
<script type="application/javascript" src="pc.js"></script>
- <script type="text/javascript" src="../../test/manifest.js"></script>
</head>
<body>
<pre id="test">
<script type="application/javascript">
-var manager = new MediaTestManager;
createHTML({
bug: "1081409",
title: "Captured video-only over peer connection",
visible: true
}).then(() => new Promise(resolve => {
+ // Run tests in sequence for log readability.
+ PARALLEL_TESTS = 1;
+ let manager = new MediaTestManager;
+ window.mediaTestManager = manager;
manager.runTests(getPlayableVideos(gLongerTests), startTest);
manager.onFinished = () => {
// Tear down before SimpleTest.finish.
if ("nsINetworkInterfaceListService" in SpecialPowers.Ci) {
getNetworkUtils().tearDownNetwork();
}
resolve();
};
}))
.catch(e => ok(false, "Unexpected " + e + ":\n" + e.stack));
-// Run tests in sequence for log readability.
-PARALLEL_TESTS = 1;
-
function startTest(media, token) {
+ let manager = window.mediaTestManager;
manager.started(token);
var video = document.createElement('video');
video.id = "id_" + media.name;
video.width = 160;
video.height = 120;
video.muted = true;
video.loop = true;
video.preload = "metadata";