Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 988223004: Make SSLClientSocketFalseStartTest.NoSessionResumptionBeforeFinish not a no-op. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 2390bd59ff68a36c2a2a119b4f44aa828156381b..f48e1c77a2cd8dee1149d88175ac371660835f36 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -3178,6 +3178,14 @@ TEST_F(SSLClientSocketFalseStartTest, NoSessionResumptionBeforeFinish) {
// still completes.
EXPECT_EQ(OK, callback.WaitForResult());
+ // Leave the server Finished blocked, but wait for it to arrive. This ensures
+ // the server has completed the handshake and added the session to its session
+ // cache.
Ryan Sleevi 2015/03/09 21:56:12 Suggested reword: // Continue to block the client
davidben 2015/03/09 22:01:13 Done.
+ scoped_refptr<IOBuffer> buf(new IOBuffer(4096));
+ int rv = sock1->Read(buf.get(), 4096, callback.callback());
+ EXPECT_EQ(ERR_IO_PENDING, rv);
+ raw_transport1->WaitForReadResult();
+
// Drop the old socket. This is needed because the Python test server can't
// service two sockets in parallel.
sock1.reset();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698