diff options
| -rw-r--r-- | net/spdy/spdy_websocket_stream_unittest.cc | 20 | ||||
| -rw-r--r-- | tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/net/spdy/spdy_websocket_stream_unittest.cc b/net/spdy/spdy_websocket_stream_unittest.cc index 310c533..b964174 100644 --- a/net/spdy/spdy_websocket_stream_unittest.cc +++ b/net/spdy/spdy_websocket_stream_unittest.cc @@ -588,18 +588,20 @@ TEST_F(SpdyWebSocketStreamTest, IOPending) { ConstructSpdySettings(spdy_settings_to_send_)); MockWrite writes[] = { // Setting throttling make SpdySession send settings frame automatically. - CreateMockWrite(*settings_frame), - CreateMockWrite(*request_frame_.get(), 2), - CreateMockWrite(*message_frame_.get(), 4), - CreateMockWrite(*closing_frame_.get(), 6) + CreateMockWrite(*settings_frame.get(), 1), + CreateMockWrite(*request_frame_.get(), 3), + CreateMockWrite(*message_frame_.get(), 6), + CreateMockWrite(*closing_frame_.get(), 9) }; MockRead reads[] = { - CreateMockRead(*response_frame_.get(), 3), - CreateMockRead(*message_frame_.get(), 5), - // Skip sequence 7 to notify closing has been sent. - CreateMockRead(*closing_frame_.get(), 8), - MockRead(false, 0, 9) // EOF cause OnCloseSpdyStream event. + CreateMockRead(*settings_frame.get(), 2), + CreateMockRead(*response_frame_.get(), 4), + // Skip sequence 5 (I/O Pending) + CreateMockRead(*message_frame_.get(), 7), + // Skip sequence 8 (I/O Pending) + CreateMockRead(*closing_frame_.get(), 10), + MockRead(false, 0, 11) // EOF cause OnCloseSpdyStream event. }; EXPECT_EQ(OK, InitSession(reads, arraysize(reads), diff --git a/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt index 89e5cf2a..984bcde 100644 --- a/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt +++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt @@ -10,9 +10,5 @@ X509CertificateTest.* # Too many uninits and too slow. TODO(timurrrr): investigate uninits ProxyResolverV8Test.* -# Fails under Dr. Memory (looks like the test is broken) -# http://crbug.com/87620 -SpdyWebSocketStreamTest.IOPending - # Slow CookieMonsterTest.GarbageCollectionTriggers |