diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-09 16:37:49 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-09 16:37:49 +0000 |
| commit | 01830fcea5090a86cb807268e0366f511186cab0 (patch) | |
| tree | 15d316517d2110e90a194a08503a85d6ab610c5d /net | |
| parent | ec5b50d6d76fc975f0e7b5e037f28974e13cabb5 (diff) | |
| download | chromium_src-01830fcea5090a86cb807268e0366f511186cab0.zip chromium_src-01830fcea5090a86cb807268e0366f511186cab0.tar.gz chromium_src-01830fcea5090a86cb807268e0366f511186cab0.tar.bz2 | |
net: alter detection of end of SSL connection in tests.
This is a follow-up to r61991 that alters the logic for figuring out
if an SSL connection completed in unittests. The tests which use this
are currently disabled. I just want to see if they start passing on
the Windows tsan bot so that I can re-enable them.
TBR=aboodman
TEST=net_unittests
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index ee5c6d7..b2a80ed 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -52,8 +52,8 @@ static bool LogContainsSSLConnectEndEvent( // This logging is temporary in order to debug a failure on Windows tsan // bots. bool r = net::LogContainsEndEvent(log, -1, net::NetLog::TYPE_SSL_CONNECT) || - net::LogContainsEndEvent( - log, -1, net::NetLog::TYPE_SOCKET_BYTES_SENT); + net::LogContainsEvent(log, -1, net::NetLog::TYPE_SOCKET_BYTES_SENT, + net::NetLog::PHASE_NONE); if (!r) { const int index = i + log.size(); const net::CapturingNetLog::Entry& entry = log[index]; |