diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 11:14:54 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 11:14:54 +0000 |
| commit | 1442b29a275b076203b5e0a78206fe3feda3b739 (patch) | |
| tree | 48b8fdcd37247dabe914329c55dacafceba548e4 | |
| parent | 74b42fc17ac6a967bb9159b8270169dc63545ec0 (diff) | |
| download | chromium_src-1442b29a275b076203b5e0a78206fe3feda3b739.zip chromium_src-1442b29a275b076203b5e0a78206fe3feda3b739.tar.gz chromium_src-1442b29a275b076203b5e0a78206fe3feda3b739.tar.bz2 | |
Fix tsan failure in SpdyStreamTest.
Under tsan, tcp connect job tries to connect several times and fails to find
data provider for mock socket.
Make connect synchronous (as done in SpdySessionTest) fixes the issue.
BUG=none
TEST=./tools/valgrind/chrome_tests.sh --build_dir out/Debug --test net --tool tsan --gtest_filter='SpdyStreamTest.*'
Review URL: http://codereview.chromium.org/3054002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53036 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/socket/socket_test_util.h | 2 | ||||
| -rw-r--r-- | net/spdy/spdy_stream_unittest.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index bb52c0c..2bd0d23 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -350,7 +350,7 @@ class SocketDataProviderArray { } T* GetNext() { - DCHECK(next_index_ < data_providers_.size()); + DCHECK_LT(next_index_, data_providers_.size()); return data_providers_[next_index_++]; } diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc index 4105aa6..34ae922 100644 --- a/net/spdy/spdy_stream_unittest.cc +++ b/net/spdy/spdy_stream_unittest.cc @@ -238,6 +238,8 @@ TEST_F(SpdyStreamTest, SendDataAfterOpen) { scoped_refptr<OrderedSocketData> data( new OrderedSocketData(reads, arraysize(reads), writes, arraysize(writes))); + MockConnect connect_data(false, OK); + data->set_connect_data(connect_data); session_deps.socket_factory.AddSocketDataProvider(data.get()); SpdySession::SetSSLMode(false); |