diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 15:32:51 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 15:32:51 +0000 |
| commit | 44538b81b2db5de46effbd9cd532e57075f6c2a5 (patch) | |
| tree | fa0a4f0b27d72bb774b07101addec6a64a6b8e4f /net | |
| parent | ac54efc81249bf1b855e63e0fc77d3082c0b221b (diff) | |
| download | chromium_src-44538b81b2db5de46effbd9cd532e57075f6c2a5.zip chromium_src-44538b81b2db5de46effbd9cd532e57075f6c2a5.tar.gz chromium_src-44538b81b2db5de46effbd9cd532e57075f6c2a5.tar.bz2 | |
SpdyWebSocketStreamTest.IOPending is failing on the Dr.Memory bots.
SPDY Settings frame requires socket read completion in 100ms.
But IO Pending situation did not guarantee that.
We should prepare one receiving frame which doesn't affect the test.
BUG=87620
TEST=tools\valgrind\chrome_tests.bat -t net_unittests --tool
drmemory --build_dir net/Debug --gtest_filter=SpdyWebSocketStreamTest.IOPending
Review URL: http://codereview.chromium.org/7277029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/spdy/spdy_websocket_stream_unittest.cc | 20 |
1 files changed, 11 insertions, 9 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), |