Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: LayoutTests/http/tests/xmlhttprequest/resources/response-stream-abort.js

Issue 1004623007: Streams Implementation Update: async read (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@stream-reader-read
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/http/tests/xmlhttprequest/resources/response-stream-abort.js
diff --git a/LayoutTests/http/tests/xmlhttprequest/resources/response-stream-abort.js b/LayoutTests/http/tests/xmlhttprequest/resources/response-stream-abort.js
index 1d7226f48c87f9e5740d2ec51a9a3ba095f3ff99..a07ff88f39932b652dd79407d50d48ac123090c0 100644
--- a/LayoutTests/http/tests/xmlhttprequest/resources/response-stream-abort.js
+++ b/LayoutTests/http/tests/xmlhttprequest/resources/response-stream-abort.js
@@ -38,7 +38,7 @@ testInLoadingState.step(function()
assert_equals(xhr.readyState, xhr.UNSENT, 'xhr.readyState after abort() call');
assert_equals(xhr.response, null, 'xhr.response after abort() call');
assert_array_equals(seenStates, [xhr.OPENED, xhr.HEADERS_RECEIVED, xhr.LOADING, xhr.DONE]);
- stream.closed.then(testInLoadingState.step_func(assert_unreached), testInLoadingState.done.bind(testInLoadingState));
+ stream.getReader().closed.then(testInLoadingState.step_func(assert_unreached), testInLoadingState.done.bind(testInLoadingState));
return;
case xhr.DONE:
@@ -57,11 +57,8 @@ testInLoadingState.step(function()
var testInDoneState = async_test('Test aborting XMLHttpRequest with responseType set to "stream" in DONE state.');
function readUntilDone(reader) {
- return reader.ready.then(function() {
- while (reader.state == 'readable') {
- reader.read();
- }
- if (reader.state == 'closed' || reader.state == 'errored') {
+ return reader.read().then(function(r) {
+ if (r.done) {
return reader.closed;
} else {
return readUntilDone(reader);
@@ -103,7 +100,7 @@ testInDoneState.step(function()
assert_equals(xhr.response, null, 'xhr.response after abort() call');
assert_array_equals(seenStates, [xhr.OPENED, xhr.HEADERS_RECEIVED, xhr.LOADING, xhr.DONE]);
- return stream.closed;
+ return stream.getReader().closed;
}).then(function() {
testInDoneState.done();
}).catch(testInDoneState.step_func(function(e) {

Powered by Google App Engine
This is Rietveld 408576698