diff options
4 files changed, 18 insertions, 24 deletions
diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index ea4664e..94cec09 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -4943,10 +4943,10 @@ TEST_F(HttpNetworkTransactionSpdy2Test, BasicAuthSpdyProxy) { ConstructSpdyBodyFrame(3, get, strlen(get), false)); MockWrite spdy_writes[] = { - CreateMockWrite(*req, 0, ASYNC), - CreateMockWrite(*connect2, 2), - CreateMockWrite(*rst, 3, ASYNC), - CreateMockWrite(*wrapped_get, 5), + CreateMockWrite(*req, 1, ASYNC), + CreateMockWrite(*connect2, 4), + CreateMockWrite(*rst, 5, ASYNC), + CreateMockWrite(*wrapped_get, 8), }; // The proxy responds to the connect with a 407, using a persistent @@ -4977,11 +4977,11 @@ TEST_F(HttpNetworkTransactionSpdy2Test, BasicAuthSpdyProxy) { scoped_ptr<SpdyFrame> wrapped_body( ConstructSpdyBodyFrame(3, "hello", 5, false)); MockRead spdy_reads[] = { - CreateMockRead(*conn_auth_resp, 1, ASYNC), - CreateMockRead(*conn_resp, 4, ASYNC), - CreateMockRead(*wrapped_get_resp, 5, ASYNC), - CreateMockRead(*wrapped_body, 6, ASYNC), - MockRead(SYNCHRONOUS, ERR_IO_PENDING), + CreateMockRead(*conn_auth_resp, 2, ASYNC), + CreateMockRead(*conn_resp, 6, ASYNC), + CreateMockRead(*wrapped_get_resp, 9, ASYNC), + CreateMockRead(*wrapped_body, 10, ASYNC), + MockRead(ASYNC, OK, 11), // EOF. May or may not be read. }; scoped_ptr<OrderedSocketData> spdy_data( diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc index f9b5f7a..cfafd7e 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -4943,10 +4943,10 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthSpdyProxy) { ConstructSpdyBodyFrame(3, get, strlen(get), false)); MockWrite spdy_writes[] = { - CreateMockWrite(*req, 0, ASYNC), - CreateMockWrite(*connect2, 2), - CreateMockWrite(*rst, 3, ASYNC), - CreateMockWrite(*wrapped_get, 5) + CreateMockWrite(*req, 1, ASYNC), + CreateMockWrite(*connect2, 4), + CreateMockWrite(*rst, 5, ASYNC), + CreateMockWrite(*wrapped_get, 8) }; // The proxy responds to the connect with a 407, using a persistent @@ -4977,11 +4977,11 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthSpdyProxy) { scoped_ptr<SpdyFrame> wrapped_body( ConstructSpdyBodyFrame(3, "hello", 5, false)); MockRead spdy_reads[] = { - CreateMockRead(*conn_auth_resp, 1, ASYNC), - CreateMockRead(*conn_resp, 4, ASYNC), - CreateMockRead(*wrapped_get_resp, 5, ASYNC), - CreateMockRead(*wrapped_body, 6, ASYNC), - MockRead(SYNCHRONOUS, ERR_IO_PENDING), + CreateMockRead(*conn_auth_resp, 2, ASYNC), + CreateMockRead(*conn_resp, 6, ASYNC), + CreateMockRead(*wrapped_get_resp, 9, ASYNC), + CreateMockRead(*wrapped_body, 10, ASYNC), + MockRead(SYNCHRONOUS, ERR_IO_PENDING), // EOF. May or may not be read. }; scoped_ptr<OrderedSocketData> spdy_data( 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 1f32bcd..f394610 100644 --- a/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt +++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt @@ -23,9 +23,6 @@ ClientSocketPoolBaseTest.DisableCleanupTimer # Flaky, see http://crbug.com/108422 SSLClientSocketTest.ConnectMismatched -# Sometimes fails, see http://crbug.com/130874 -HttpNetworkTransactionSpdy2Test.BasicAuthSpdyProxy - ############################################################################## # TODO(rnk): The exclusions below should only apply to the full mode # DrMemory bot. diff --git a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt index fd0c9a6..93ff8bd 100644 --- a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt +++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt @@ -29,6 +29,3 @@ DnsConfigServiceTest.*GetSystemConfig # Times out occasionally, http://crbug.com/124452 HostResolverImplTest.StartWithinCallback - -# Fails on most runs. http://crbug.com/130874 -HttpNetworkTransactionSpdy2Test.BasicAuthSpdyProxy |