diff options
Diffstat (limited to 'net/spdy/spdy_session_unittest.cc')
-rw-r--r-- | net/spdy/spdy_session_unittest.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc index a5d9292..0e8b370 100644 --- a/net/spdy/spdy_session_unittest.cc +++ b/net/spdy/spdy_session_unittest.cc @@ -190,12 +190,8 @@ INSTANTIATE_TEST_CASE_P( TEST_P(SpdySessionTest, InitialReadError) { CreateDeterministicNetworkSession(); - base::WeakPtr<SpdySession> session = TryCreateFakeSpdySessionExpectingFailure( + TryCreateFakeSpdySessionExpectingFailure( spdy_session_pool_, key_, ERR_FAILED); - EXPECT_TRUE(session); - // Flush the read. - base::RunLoop().RunUntilIdle(); - EXPECT_FALSE(session); } namespace { @@ -281,6 +277,8 @@ TEST_P(SpdySessionTest, PendingStreamCancellingAnother) { session->CloseSessionOnError(ERR_ABORTED, "Aborting session"); EXPECT_EQ(ERR_ABORTED, callback1.WaitForResult()); + + data.RunFor(1); } // A session receiving a GOAWAY frame with no active streams should @@ -332,12 +330,9 @@ TEST_P(SpdySessionTest, GoAwayImmediatelyWithNoActiveStreams) { data.StopAfter(1); - base::WeakPtr<SpdySession> session = - TryCreateInsecureSpdySessionExpectingFailure( - http_session_, key_, ERR_CONNECTION_CLOSED, BoundNetLog()); - base::RunLoop().RunUntilIdle(); + TryCreateInsecureSpdySessionExpectingFailure( + http_session_, key_, ERR_CONNECTION_CLOSED, BoundNetLog()); - EXPECT_FALSE(session); EXPECT_FALSE(HasSpdySession(spdy_session_pool_, key_)); } @@ -1050,6 +1045,8 @@ TEST_P(SpdySessionTest, FailedPing) { EXPECT_TRUE(session == NULL); EXPECT_FALSE(HasSpdySession(spdy_session_pool_, key_)); + + data.RunFor(1); EXPECT_EQ(NULL, spdy_stream1.get()); } |