Changeset 194329 in webkit

Timestamp:

Dec 21, 2015, 7:15:23 AM (11 years ago)

Author:

calvaris@igalia.com

Message:

[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.

Location:

trunk/LayoutTests/imported/w3c

Files:

• ChangeLog (modified) (1 diff)
• web-platform-tests/streams-api/README.txt (modified) (1 diff)
• web-platform-tests/streams-api/readable-streams/cancel-expected.txt (modified) (2 diffs)
• web-platform-tests/streams-api/readable-streams/cancel.js (modified) (3 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+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.
+
 2015-12-20  Commit Queue  <commit-queue@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/README.txt

@@ -4 +4 @@
 automatic.
 
-Current version: https://github.com/whatwg/streams/tree/18ed463e50c189c0198e2336dfbd10b17f379081/reference-implementation/web-platform-tests
+Current version: https://github.com/whatwg/streams/tree/f7cb0eac03e6a6d045d6e8c09df1f9f8a264fdef/reference-implementation/web-platform-tests.

trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel-expected.txt

@@ -1 +1 @@
 
-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"
+PASS ReadableStream cancellation: integration test on an infinite stream derived from a random push source 
 PASS ReadableStream cancellation: cancel(reason) should pass through the given reason to the underlying source 
 PASS ReadableStream cancellation: cancel() on a locked stream should fail and not call the underlying source cancel 
@@ -12 +12 @@
 FAIL Load cancel.js with SharedWorker assert_unreached: SharedWorker is unavailable Reached unreachable code
 FAIL Untitled undefined is not an object (evaluating 'navigator.serviceWorker.getRegistration')
-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"
+FAIL ReadableStream cancellation: integration test on an infinite stream derived from a random push source Can't find variable: ReadableStream
 FAIL ReadableStream cancellation: cancel(reason) should pass through the given reason to the underlying source Can't find variable: ReadableStream
 FAIL ReadableStream cancellation: cancel() on a locked stream should fail and not call the underlying source cancel Can't find variable: ReadableStream

trunk/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/cancel.js

@@ -8 +8 @@
 
 promise_test(() => {
-
-  // WebKit edit. We force a failure in this tests for now because it is flaky.
-  return Promise.reject(new Error("forced error"));
 
   const randomSource = new RandomPushSource();
@@ -43 +40 @@
   // We call delay multiple times to avoid cancelling too early for the
   // source to enqueue at least one chunk.
-  const cancel = delay(5).then(() => delay(5)).then(() => delay(5)).then(() => reader.cancel());
+  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;
+  })
 
   return readableStreamToArray(rs, reader).then(chunks => {
@@ -50 +51 @@
       assert_equals(chunks[i].length, 128, 'chunk ' + i + ' should have 128 bytes');
     }
-    assert_false(cancellationFinished, 'it did not wait for the cancellation process to finish before closing');
     return cancel;
   }).then(() => {