<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[215095] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/215095">215095</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-07 08:24:09 -0700 (Fri, 07 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve some WebRTC flaky tests
https://bugs.webkit.org/show_bug.cgi?id=170584
Patch by Youenn Fablet <youenn@apple.com> on 2017-04-07
Reviewed by Alex Christensen.
* webrtc/libwebrtc/descriptionGetters.html:
* webrtc/video-replace-track-to-null.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestswebrtclibwebrtcdescriptionGettershtml">trunk/LayoutTests/webrtc/libwebrtc/descriptionGetters.html</a></li>
<li><a href="#trunkLayoutTestswebrtcvideoreplacetracktonullhtml">trunk/LayoutTests/webrtc/video-replace-track-to-null.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (215094 => 215095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-07 15:05:43 UTC (rev 215094)
+++ trunk/LayoutTests/ChangeLog 2017-04-07 15:24:09 UTC (rev 215095)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-04-07 Youenn Fablet <youenn@apple.com>
+
+ Improve some WebRTC flaky tests
+ https://bugs.webkit.org/show_bug.cgi?id=170584
+
+ Reviewed by Alex Christensen.
+
+ * webrtc/libwebrtc/descriptionGetters.html:
+ * webrtc/video-replace-track-to-null.html:
+
</ins><span class="cx"> 2017-04-07 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Text insertion cursor disappears after pressing enter
</span></span></pre></div>
<a id="trunkLayoutTestswebrtclibwebrtcdescriptionGettershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/libwebrtc/descriptionGetters.html (215094 => 215095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/libwebrtc/descriptionGetters.html 2017-04-07 15:05:43 UTC (rev 215094)
+++ trunk/LayoutTests/webrtc/libwebrtc/descriptionGetters.html 2017-04-07 15:24:09 UTC (rev 215095)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> promise_test((test) => {
</span><span class="cx"> if (window.internals)
</span><span class="cx"> internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
</span><del>-
</del><ins>+
</ins><span class="cx"> var localConnection = new RTCPeerConnection();
</span><span class="cx"> var remoteConnection = new RTCPeerConnection();
</span><span class="cx"> var currentSDP;
</span><span class="lines">@@ -36,47 +36,43 @@
</span><span class="cx"> localDescriptionPromise = localConnection.setLocalDescription(desc);
</span><span class="cx"> remoteDescriptionPromise = remoteConnection.setRemoteDescription(desc);
</span><span class="cx">
</span><del>- assert_equals(localConnection.currentLocalDescription, null);
- assert_equals(localConnection.pendingLocalDescription.sdp, currentSDP);
- assert_equals(localConnection.localDescription.sdp, currentSDP);
</del><ins>+ assert_equals(localConnection.currentLocalDescription, null, "test 1");
+ assert_equals(localConnection.pendingLocalDescription.sdp, currentSDP, "test 2");
+ assert_equals(localConnection.localDescription.sdp, currentSDP, "test 3");
</ins><span class="cx">
</span><span class="cx"> assert_equals(remoteConnection.currentRemoteDescription, null);
</span><del>- assert_equals(remoteConnection.pendingRemoteDescription.sdp, currentSDP);
- assert_equals(remoteConnection.remoteDescription.sdp, currentSDP);
</del><ins>+ assert_equals(remoteConnection.pendingRemoteDescription.sdp, currentSDP, "test 4");
+ assert_equals(remoteConnection.remoteDescription.sdp, currentSDP, "test 5");
</ins><span class="cx">
</span><span class="cx"> return Promise.all([localDescriptionPromise, remoteDescriptionPromise]);
</span><span class="cx"> }).then(() => {
</span><span class="cx"> return remoteConnection.createAnswer();
</span><del>- }).then((desc) => {
</del><ins>+ }).then((desc) => {
</ins><span class="cx"> assert_equals(localConnection.currentLocalDescription, null);
</span><del>- assert_equals(localConnection.pendingLocalDescription.sdp, currentSDP);
- assert_equals(localConnection.localDescription.sdp, currentSDP);
</del><ins>+ assert_equals(localConnection.localDescription.sdp, localConnection.pendingLocalDescription.sdp, "test 7");
</ins><span class="cx">
</span><span class="cx"> localConnection.setRemoteDescription(desc);
</span><span class="cx">
</span><del>- assert_equals(localConnection.currentLocalDescription.sdp, currentSDP);
</del><ins>+ assert_equals(localConnection.currentLocalDescription.sdp, localConnection.localDescription.sdp, "test 8");
</ins><span class="cx"> assert_equals(localConnection.pendingLocalDescription, null);
</span><del>- assert_equals(localConnection.localDescription.sdp, currentSDP);
</del><span class="cx">
</span><span class="cx"> assert_equals(remoteConnection.currentRemoteDescription, null);
</span><del>- assert_equals(remoteConnection.pendingRemoteDescription.sdp, currentSDP);
- assert_equals(remoteConnection.remoteDescription.sdp, currentSDP);
</del><ins>+ assert_equals(remoteConnection.pendingRemoteDescription.sdp, remoteConnection.remoteDescription.sdp, "test 10");
</ins><span class="cx">
</span><del>- remoteConnection.setLocalDescription(desc);
</del><ins>+ promise = remoteConnection.setLocalDescription(desc);
</ins><span class="cx">
</span><del>- assert_equals(remoteConnection.currentRemoteDescription.sdp, currentSDP);
</del><span class="cx"> assert_equals(remoteConnection.pendingRemoteDescription, null);
</span><del>- assert_equals(remoteConnection.remoteDescription.sdp, currentSDP);
</del><ins>+ return promise;
+ }).then(() => {
+ desc = remoteConnection.currentRemoteDescription;
</ins><span class="cx">
</span><span class="cx"> localConnection.createDataChannel("test");
</span><span class="cx">
</span><del>- assert_equals(localConnection.currentLocalDescription.sdp, currentSDP);
</del><ins>+ assert_equals(localConnection.currentLocalDescription.sdp, localConnection.localDescription.sdp, "test 14");
</ins><span class="cx"> assert_equals(localConnection.pendingLocalDescription, null);
</span><del>- assert_equals(localConnection.localDescription.sdp, currentSDP);
</del><span class="cx">
</span><del>- assert_equals(remoteConnection.currentRemoteDescription.sdp, currentSDP);
</del><ins>+ assert_equals(remoteConnection.currentRemoteDescription.sdp, remoteConnection.remoteDescription.sdp, "test 16");
</ins><span class="cx"> assert_equals(remoteConnection.pendingRemoteDescription, null);
</span><del>- assert_equals(remoteConnection.remoteDescription.sdp, currentSDP);
</del><span class="cx"> });
</span><span class="cx"> }, "description getters when changing description from video to video & data channel");
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideoreplacetracktonullhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-replace-track-to-null.html (215094 => 215095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-replace-track-to-null.html 2017-04-07 15:05:43 UTC (rev 215094)
+++ trunk/LayoutTests/webrtc/video-replace-track-to-null.html 2017-04-07 15:24:09 UTC (rev 215095)
</span><span class="lines">@@ -81,6 +81,8 @@
</span><span class="cx"> video.srcObject = remoteStream;
</span><span class="cx"> return video.play();
</span><span class="cx"> }).then(() => {
</span><ins>+ return waitFor(100);
+ }).then(() => {
</ins><span class="cx"> storeFrame();
</span><span class="cx"> return waitFor(100);
</span><span class="cx"> }).then(() => {
</span></span></pre>
</div>
</div>
</body>
</html>