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

Unified Diff: net/spdy/spdy_websocket_stream_unittest.cc

Issue 289823002: SPDY4: SpdySession should send SETTINGS acknowledgements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « net/spdy/spdy_test_util_common.cc ('k') | net/spdy/spdy_websocket_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_websocket_stream_unittest.cc
diff --git a/net/spdy/spdy_websocket_stream_unittest.cc b/net/spdy/spdy_websocket_stream_unittest.cc
index 04e5635c8c486b8dc410d1775bc8929baae8da39..5720675e72b1bed3f414b4337a97d8b5e0ca7865 100644
--- a/net/spdy/spdy_websocket_stream_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_unittest.cc
@@ -562,18 +562,20 @@ TEST_P(SpdyWebSocketStreamTest, IOPending) {
Prepare(1);
scoped_ptr<SpdyFrame> settings_frame(
spdy_util_.ConstructSpdySettings(spdy_settings_to_send_));
+ scoped_ptr<SpdyFrame> settings_ack(spdy_util_.ConstructSpdySettingsAck());
MockWrite writes[] = {
- CreateMockWrite(*request_frame_.get(), 1),
- CreateMockWrite(*message_frame_.get(), 3),
- CreateMockWrite(*closing_frame_.get(), 5)
+ CreateMockWrite(*settings_ack, 1),
+ CreateMockWrite(*request_frame_.get(), 2),
+ CreateMockWrite(*message_frame_.get(), 4),
+ CreateMockWrite(*closing_frame_.get(), 6)
};
MockRead reads[] = {
CreateMockRead(*settings_frame.get(), 0),
- CreateMockRead(*response_frame_.get(), 2),
- CreateMockRead(*message_frame_.get(), 4),
- CreateMockRead(*closing_frame_.get(), 6),
- MockRead(SYNCHRONOUS, 0, 7) // EOF cause OnCloseSpdyStream event.
+ CreateMockRead(*response_frame_.get(), 3),
+ CreateMockRead(*message_frame_.get(), 5),
+ CreateMockRead(*closing_frame_.get(), 7),
+ MockRead(SYNCHRONOUS, 0, 8) // EOF cause OnCloseSpdyStream event.
};
DeterministicSocketData data(reads, arraysize(reads),
@@ -622,7 +624,7 @@ TEST_P(SpdyWebSocketStreamTest, IOPending) {
SendRequest();
- data.RunFor(7);
+ data.RunFor(8);
completion_callback_.WaitForResult();
websocket_stream_.reset();
« no previous file with comments | « net/spdy/spdy_test_util_common.cc ('k') | net/spdy/spdy_websocket_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698