Bug 1093835 - Check video flow in test_pc_addSecondVideoStreamNoBundle.html. r?jib
MozReview-Commit-ID: KnhRdWNZvhs
--- a/dom/media/tests/mochitest/test_peerConnection_addSecondVideoStreamNoBundle.html
+++ b/dom/media/tests/mochitest/test_peerConnection_addSecondVideoStreamNoBundle.html
@@ -1,42 +1,51 @@
<!DOCTYPE HTML>
<html>
<head>
<script type="application/javascript" src="pc.js"></script>
+ <script type="application/javascript" src="/tests/dom/canvas/test/captureStream_common.js"></script>
</head>
<body>
<pre id="test">
<script type="application/javascript">
createHTML({
bug: "1017888",
title: "Renegotiation: add second video stream, no bundle"
});
- var test;
- runNetworkTest(function (options) {
- options = options || { };
+ runNetworkTest(function (options = {}) {
options.bundle = false;
- test = new PeerConnectionTest(options);
+ const test = new PeerConnectionTest(options);
addRenegotiation(test.chain,
[
function PC_LOCAL_ADD_SECOND_STREAM(test) {
test.setMediaConstraints([{video: true}, {video: true}],
[{video: true}]);
// Since this is a NoBundle variant, adding a track will cause us to
// go back to checking.
test.pcLocal.expectIceChecking();
- return test.pcLocal.getAllUserMedia([{video: true}]);
+ // Use fake:true here since the native fake device on linux doesn't
+ // change color as needed by checkVideoPlaying() below.
+ return test.pcLocal.getAllUserMedia([{video: true, fake: true}]);
},
function PC_REMOTE_EXPECT_ICE_CHECKING(test) {
test.pcRemote.expectIceChecking();
},
+ ],
+ [
+ function PC_REMOTE_CHECK_VIDEO_FLOW(test) {
+ const h = new VideoStreamHelper();
+ is(test.pcRemote.remoteMediaElements.length, 2,
+ "Should have two remote media elements after renegotiation");
+ return Promise.all(test.pcRemote.remoteMediaElements.map(video =>
+ h.checkVideoPlaying(video, 10, 10, 16)));
+ },
]
);
- // TODO(bug 1093835): figure out how to verify if media flows through the new stream
- test.setMediaConstraints([{video: true}], [{video: true}]);
+ test.setMediaConstraints([{video: true, fake: true}], [{video: true}]);
test.run();
});
</script>
</pre>
</body>
</html>