summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 11:14:54 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 11:14:54 +0000
commit1442b29a275b076203b5e0a78206fe3feda3b739 (patch)
tree48b8fdcd37247dabe914329c55dacafceba548e4 /net/socket
parent74b42fc17ac6a967bb9159b8270169dc63545ec0 (diff)
downloadchromium_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
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/socket_test_util.h2
1 files changed, 1 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_++];
}