fix loop

fix

remove

rename

fix yielding

add another expected

add expected

rem another

remove dcheck

rewrite state machine

rem unused

rem startread loop

read loop

fix test

use read

fix test

fix test

fix another staet

fix test

rem bool

initial write loop

fix var

bail out if closed

rem dcheck

fix onreadcomplete

fix loop

check state

remove availability state

clean up states

remove unused states

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210694 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 4 deletions

diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index e0e9cfc..3d31648 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -2014,19 +2014,21 @@ TEST_P(SpdyNetworkTransactionTest, PostWithEarlySynReply) {
 
   scoped_ptr<SpdyFrame> stream_reply(
       spdy_util_.ConstructSpdyPostSynReply(NULL, 0));
-  scoped_ptr<SpdyFrame> stream_body(spdy_util_.ConstructSpdyBodyFrame(1, true));
   MockRead reads[] = {
     CreateMockRead(*stream_reply, 1),
-    MockRead(ASYNC, 0, 3)  // EOF
+    MockRead(ASYNC, 0, 4)  // EOF
   };
 
   scoped_ptr<SpdyFrame> req(
       spdy_util_.ConstructSpdyPost(
           kRequestUrl, 1, kUploadDataSize, LOWEST, NULL, 0));
   scoped_ptr<SpdyFrame> body(spdy_util_.ConstructSpdyBodyFrame(1, true));
+  scoped_ptr<SpdyFrame> rst(
+      spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_PROTOCOL_ERROR));
   MockWrite writes[] = {
     CreateMockWrite(*req, 0),
     CreateMockWrite(*body, 2),
+    CreateMockWrite(*rst, 3)
   };
 
   DeterministicSocketData data(reads, arraysize(reads),
@@ -2043,7 +2045,7 @@ TEST_P(SpdyNetworkTransactionTest, PostWithEarlySynReply) {
       &CreatePostRequest(), callback.callback(), BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
-  data.RunFor(2);
+  data.RunFor(4);
   rv = callback.WaitForResult();
   EXPECT_EQ(ERR_SPDY_PROTOCOL_ERROR, rv);
   data.RunFor(1);
@@ -3529,7 +3531,11 @@ TEST_P(SpdyNetworkTransactionTest, CorruptFrameSessionError) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     scoped_ptr<SpdyFrame> req(
         spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, true));
-    MockWrite writes[] = { CreateMockWrite(*req), MockWrite(ASYNC, 0, 0)  // EOF
+    scoped_ptr<SpdyFrame> rst(
+        spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_PROTOCOL_ERROR));
+    MockWrite writes[] = {
+      CreateMockWrite(*req),
+      CreateMockWrite(*rst),
     };
 
     scoped_ptr<SpdyFrame> body(spdy_util_.ConstructSpdyBodyFrame(1, true));