net: mark SSLClientSocketTest.(ConnectExpired|ConnectMismatched) as FAILS_

They are failing on the Windows tsan builder only. This change also
adds logging to figure out why.

TBR=aboodman

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61991 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 4 deletions

diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 24fbb87..ee5c6d7 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -44,8 +44,25 @@ class SSLClientSocketTest : public PlatformTest {
 // write.
 static bool LogContainsSSLConnectEndEvent(
     const net::CapturingNetLog::EntryList& log, int i) {
-  return net::LogContainsEndEvent(log, -1, net::NetLog::TYPE_SSL_CONNECT) ||
-         net::LogContainsEndEvent(log, -1, net::NetLog::TYPE_SOCKET_BYTES_SENT);
+  if (log.size() == 0) {
+    LOG(INFO) << "LogContainsSSLConnectEndEvent: |log| empty";
+    return false;
+  }
+
+  // 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);
+  if (!r) {
+    const int index = i + log.size();
+    const net::CapturingNetLog::Entry& entry = log[index];
+    LOG(INFO) << "LogContainsSSLConnectEndEvent failing: "
+              << net::NetLog::EventTypeToString(entry.type)
+              << " " << entry.phase;
+  }
+
+  return r;
 };
 
 TEST_F(SSLClientSocketTest, Connect) {
@@ -90,7 +107,7 @@ TEST_F(SSLClientSocketTest, Connect) {
   EXPECT_FALSE(sock->IsConnected());
 }
 
-TEST_F(SSLClientSocketTest, ConnectExpired) {
+TEST_F(SSLClientSocketTest, FAILS_ConnectExpired) {
   net::TestServer test_server(net::TestServer::TYPE_HTTPS_EXPIRED_CERTIFICATE,
                               FilePath());
   ASSERT_TRUE(test_server.Start());
@@ -132,7 +149,7 @@ TEST_F(SSLClientSocketTest, ConnectExpired) {
   EXPECT_TRUE(LogContainsSSLConnectEndEvent(log.entries(), -1));
 }
 
-TEST_F(SSLClientSocketTest, ConnectMismatched) {
+TEST_F(SSLClientSocketTest, FAILS_ConnectMismatched) {
   net::TestServer test_server(net::TestServer::TYPE_HTTPS_MISMATCHED_HOSTNAME,
                               FilePath());
   ASSERT_TRUE(test_server.Start());