SpdySession now closes all streams on receiving GoAway stream.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3109001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55506 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 8ffa81d..8f0d5fc6 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -3623,61 +3623,15 @@
MockRead(true, 0, 0), // EOF
};
- // Because the server is telling us to GOAWAY without finishing, the browser
- // will attempt to re-establish.
- scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
- scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true));
- MockRead reads2[] = {
- CreateMockRead(*resp),
- CreateMockRead(*body),
- MockRead(true, 0, 0), // EOF
- };
-
scoped_refptr<DelayedSocketData> data(
new DelayedSocketData(1, reads, arraysize(reads),
writes, arraysize(writes)));
- scoped_refptr<DelayedSocketData> data2(
- new DelayedSocketData(1, reads2, arraysize(reads2),
- writes, arraysize(writes)));
NormalSpdyTransactionHelper helper(CreateGetRequest(),
BoundNetLog(), GetParam());
helper.AddData(data);
- helper.AddData(data2);
helper.RunToCompletion(data.get());
TransactionHelperResult out = helper.output();
- EXPECT_EQ(OK, out.rv);
-}
-
-TEST_P(SpdyNetworkTransactionTest, GoAwayWithActiveStreamFail) {
- scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
- MockWrite writes[] = { CreateMockWrite(*req) };
-
- scoped_ptr<spdy::SpdyFrame> go_away(ConstructSpdyGoAway());
- MockRead reads[] = {
- CreateMockRead(*go_away),
- MockRead(true, 0, 0), // EOF
- };
-
- // Because the server is telling us to GOAWAY without finishing, the browser
- // will attempt to re-establish. On the second connection, just close. This
- // should trigger the ERR_CONNECTION_CLOSED status.
- MockRead reads2[] = {
- MockRead(true, 0, 0), // EOF
- };
-
- scoped_refptr<DelayedSocketData> data(
- new DelayedSocketData(1, reads, arraysize(reads),
- writes, arraysize(writes)));
- scoped_refptr<DelayedSocketData> data2(
- new DelayedSocketData(1, reads2, arraysize(reads2),
- writes, arraysize(writes)));
- NormalSpdyTransactionHelper helper(CreateGetRequest(),
- BoundNetLog(), GetParam());
- helper.AddData(data);
- helper.AddData(data2);
- helper.RunToCompletion(data.get());
- TransactionHelperResult out = helper.output();
- EXPECT_EQ(ERR_CONNECTION_CLOSED, out.rv);
+ EXPECT_EQ(ERR_ABORTED, out.rv);
}
TEST_P(SpdyNetworkTransactionTest, CloseWithActiveStream) {
