<!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>[194329] trunk/LayoutTests/imported/w3c</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/194329">194329</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-12-21 07:15:23 -0800 (Mon, 21 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] imported/w3c/web-platform-tests/streams-api/readable-streams/cancel.html has a flaky test
https://bugs.webkit.org/show_bug.cgi?id=152065
Reviewed by Youenn Fablet.
https://github.com/whatwg/streams/pull/414 and https://github.com/whatwg/streams/issues/413 was closed. Changes
I did on the spec were integrated so they were brought back to the imported tests in WebKit.
* web-platform-tests/streams-api/README.txt: Updated version.
* web-platform-tests/streams-api/readable-streams/cancel-expected.txt: Expectations.
* web-platform-tests/streams-api/readable-streams/cancel.js: Changed to cancel test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsapiREADMEtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/README.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsapireadablestreamscancelexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsstreamsapireadablestreamscanceljs">trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (194328 => 194329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2015-12-21 10:03:36 UTC (rev 194328)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2015-12-21 15:15:23 UTC (rev 194329)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-21 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] imported/w3c/web-platform-tests/streams-api/readable-streams/cancel.html has a flaky test
+ https://bugs.webkit.org/show_bug.cgi?id=152065
+
+ Reviewed by Youenn Fablet.
+
+ https://github.com/whatwg/streams/pull/414 and https://github.com/whatwg/streams/issues/413 was closed. Changes
+ I did on the spec were integrated so they were brought back to the imported tests in WebKit.
+
+ * web-platform-tests/streams-api/README.txt: Updated version.
+ * web-platform-tests/streams-api/readable-streams/cancel-expected.txt: Expectations.
+ * web-platform-tests/streams-api/readable-streams/cancel.js: Changed to cancel test.
+
</ins><span class="cx"> 2015-12-20 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r194033 and r194267.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsapiREADMEtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/README.txt (194328 => 194329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/README.txt 2015-12-21 10:03:36 UTC (rev 194328)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/README.txt 2015-12-21 15:15:23 UTC (rev 194329)
</span><span class="lines">@@ -3,4 +3,4 @@
</span><span class="cx"> There is a plan to move these tests to web-platform-tests repository so from that moment on this importation will be
</span><span class="cx"> automatic.
</span><span class="cx">
</span><del>-Current version: https://github.com/whatwg/streams/tree/18ed463e50c189c0198e2336dfbd10b17f379081/reference-implementation/web-platform-tests
</del><ins>+Current version: https://github.com/whatwg/streams/tree/f7cb0eac03e6a6d045d6e8c09df1f9f8a264fdef/reference-implementation/web-platform-tests.
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsapireadablestreamscancelexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel-expected.txt (194328 => 194329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel-expected.txt 2015-12-21 10:03:36 UTC (rev 194328)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel-expected.txt 2015-12-21 15:15:23 UTC (rev 194329)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx">
</span><del>-FAIL ReadableStream cancellation: integration test on an infinite stream derived from a random push source promise_test: Unhandled rejection with value: object "Error: forced error"
</del><ins>+PASS ReadableStream cancellation: integration test on an infinite stream derived from a random push source
</ins><span class="cx"> PASS ReadableStream cancellation: cancel(reason) should pass through the given reason to the underlying source
</span><span class="cx"> PASS ReadableStream cancellation: cancel() on a locked stream should fail and not call the underlying source cancel
</span><span class="cx"> PASS ReadableStream cancellation: should fulfill promise when cancel callback went fine
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> PASS ReadableStream cancellation: cancelling before start finishes should prevent pull() from being called
</span><span class="cx"> FAIL Load cancel.js with SharedWorker assert_unreached: SharedWorker is unavailable Reached unreachable code
</span><span class="cx"> FAIL Untitled undefined is not an object (evaluating 'navigator.serviceWorker.getRegistration')
</span><del>-FAIL ReadableStream cancellation: integration test on an infinite stream derived from a random push source promise_test: Unhandled rejection with value: object "Error: forced error"
</del><ins>+FAIL ReadableStream cancellation: integration test on an infinite stream derived from a random push source Can't find variable: ReadableStream
</ins><span class="cx"> FAIL ReadableStream cancellation: cancel(reason) should pass through the given reason to the underlying source Can't find variable: ReadableStream
</span><span class="cx"> FAIL ReadableStream cancellation: cancel() on a locked stream should fail and not call the underlying source cancel Can't find variable: ReadableStream
</span><span class="cx"> FAIL ReadableStream cancellation: should fulfill promise when cancel callback went fine Can't find variable: ReadableStream
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsstreamsapireadablestreamscanceljs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel.js (194328 => 194329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel.js 2015-12-21 10:03:36 UTC (rev 194328)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel.js 2015-12-21 15:15:23 UTC (rev 194329)
</span><span class="lines">@@ -8,9 +8,6 @@
</span><span class="cx">
</span><span class="cx"> promise_test(() => {
</span><span class="cx">
</span><del>- // WebKit edit. We force a failure in this tests for now because it is flaky.
- return Promise.reject(new Error("forced error"));
-
</del><span class="cx"> const randomSource = new RandomPushSource();
</span><span class="cx">
</span><span class="cx"> let cancellationFinished = false;
</span><span class="lines">@@ -42,14 +39,17 @@
</span><span class="cx">
</span><span class="cx"> // We call delay multiple times to avoid cancelling too early for the
</span><span class="cx"> // source to enqueue at least one chunk.
</span><del>- const cancel = delay(5).then(() => delay(5)).then(() => delay(5)).then(() => reader.cancel());
</del><ins>+ const cancel = delay(5).then(() => delay(5)).then(() => delay(5)).then(() => {
+ let cancelPromise = reader.cancel();
+ assert_false(cancellationFinished, 'cancellation in source should happen later');
+ return cancelPromise;
+ })
</ins><span class="cx">
</span><span class="cx"> return readableStreamToArray(rs, reader).then(chunks => {
</span><span class="cx"> assert_greater_than(chunks.length, 0, 'at least one chunk should be read');
</span><span class="cx"> for (let i = 0; i < chunks.length; i++) {
</span><span class="cx"> assert_equals(chunks[i].length, 128, 'chunk ' + i + ' should have 128 bytes');
</span><span class="cx"> }
</span><del>- assert_false(cancellationFinished, 'it did not wait for the cancellation process to finish before closing');
</del><span class="cx"> return cancel;
</span><span class="cx"> }).then(() => {
</span><span class="cx"> assert_true(cancellationFinished, 'it returns a promise that is fulfilled when the cancellation finishes');
</span></span></pre>
</div>
</div>
</body>
</html>