diff options
| author | davidben <davidben@chromium.org> | 2015-06-09 09:06:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 16:07:01 +0000 |
| commit | 33492198d9faf644542a6863a0321228cd089054 (patch) | |
| tree | daeaa2b213a565933b6490f5896d53fcf83b3361 /net/socket | |
| parent | 705094a0b97196e8ad8d98b332e20f8c777a9aef (diff) | |
| download | chromium_src-33492198d9faf644542a6863a0321228cd089054.zip chromium_src-33492198d9faf644542a6863a0321228cd089054.tar.gz chromium_src-33492198d9faf644542a6863a0321228cd089054.tar.bz2 | |
Remove unnecessary ExpectLogContainsEventSomewhere in ConnectClientAuthCertRequested test.
As of https://chromiumcodereview.appspot.com/11633021, the transport socket is
only read from when the SSL stack machine requests a read. This means that the
condition in ConnectClientAuthCertRequested's comment can no longer happen.
Switch it back to LogContainsEndEvent.
To that end, ensure memio_GetReadRequest is accurate. memio_PutReadResult
should clear read_requested and not request a new read until the SSL state
machine has been run.
BUG=none
Review URL: https://codereview.chromium.org/1153063008
Cr-Commit-Position: refs/heads/master@{#333497}
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 8d6bb1b..384e290 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -1134,16 +1134,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthCertRequested) { rv = callback.WaitForResult(); log.GetEntries(&entries); - // Because the handshake is aborted during the CertificateRequest, the server - // may still send the ServerHelloDone afterwards. As a result, the SSL_CONNECT - // may not be the last entry. See http://crbug.com/54445. Because of this, use - // ExpectLogContainsSomewhere, rather than LogContainsEndEvent, to avoid - // assuming particular details about the read (e.g. assuming there will only - // be one extra read, when there might be more). - // - // TODO(davidben): Is this still possible with memio_GetReadRequest? - ExpectLogContainsSomewhere( - entries, 0, NetLog::TYPE_SSL_CONNECT, NetLog::PHASE_END); + EXPECT_TRUE(LogContainsEndEvent(entries, -1, NetLog::TYPE_SSL_CONNECT)); EXPECT_EQ(ERR_SSL_CLIENT_AUTH_CERT_NEEDED, rv); EXPECT_FALSE(sock->IsConnected()); } |