imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection.html...

https://bugs.webkit.org/show_bug.cgi?id=152436

Reviewed by Darin Adler.

GCController is not available in Worker environments, explaining probably why garbage-collection-2.html is not crashing at all.
Inlining half of the tests in garbage-collection-2.html (runned in window) to compare with garbage-collection-1.html.

* web-platform-tests/streams-api/readable-streams/garbage-collection-2-expected.txt:
* web-platform-tests/streams-api/readable-streams/garbage-collection-2.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195924 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
index e12d32b..b1081aa 100644 (file)
--- a/LayoutTests/imported/w3c/ChangeLog
+++ b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,16 @@
+2016-01-31  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection.html asserts frequently
+        https://bugs.webkit.org/show_bug.cgi?id=152436
+
+        Reviewed by Darin Adler.
+
+        GCController is not available in Worker environments, explaining probably why garbage-collection-2.html is not crashing at all.
+        Inlining half of the tests in garbage-collection-2.html (runned in window) to compare with garbage-collection-1.html.
+
+        * web-platform-tests/streams-api/readable-streams/garbage-collection-2-expected.txt:
+        * web-platform-tests/streams-api/readable-streams/garbage-collection-2.html:
+
 2016-01-30  Chris Dumez  <cdumez@apple.com>
 
         [JS Bindings] prototype.constructor should be writable

diff --git a/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection-2-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection-2-expected.txt
index fb652b8..e57d0cc 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection-2-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection-2-expected.txt
@@ -1,6 +1,4 @@
 
 PASS ReadableStreamController methods should continue working properly when scripts lose their reference to the readable stream 
 PASS ReadableStream closed promise should fulfill even if the stream and reader JS references are lost 
-PASS ReadableStream closed promise should reject even if stream and reader JS references are lost 
-PASS Garbage-collecting a ReadableStreamReader should not unlock its stream 
 

diff --git a/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection-2.html b/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection-2.html
index 99a3805..7be3a4e 100644 (file)
--- a/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection-2.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection-2.html
@@ -9,5 +9,40 @@
 <!-- File to be removed once https://bugs.webkit.org/show_bug.cgi?id=152436 is resolved -->
 <script>
 'use strict';
-fetch_tests_from_worker(new Worker('garbage-collection.js'));
+
+promise_test(() => {
+
+  let controller;
+  new ReadableStream({
+    start(c) {
+      controller = c;
+    }
+  });
+
+  garbageCollect();
+
+  return delay(50).then(() => {
+    controller.close();
+    assert_throws(new TypeError(), () => controller.close(), 'close should throw a TypeError the second time');
+    assert_throws(new TypeError(), () => controller.error(), 'error should throw a TypeError on a closed stream');
+  });
+
+}, 'ReadableStreamController methods should continue working properly when scripts lose their reference to the ' +
+   'readable stream');
+
+promise_test(() => {
+
+  let controller;
+
+  const closedPromise = new ReadableStream({
+    start(c) {
+      controller = c;
+    }
+  }).getReader().closed;
+
+  garbageCollect();
+
+  return delay(50).then(() => controller.close()).then(() => closedPromise);
+
+}, 'ReadableStream closed promise should fulfill even if the stream and reader JS references are lost');
 </script>