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

Side by Side Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed location of enable_connect_job_waiting_ and added documentation. Created 6 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_proxy_client_socket_pool.h" 5 #include "net/http/http_proxy_client_socket_pool.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 scoped_ptr<ClientSocketPoolHistograms> ssl_histograms_; 222 scoped_ptr<ClientSocketPoolHistograms> ssl_histograms_;
223 scoped_ptr<SSLClientSocketPool> pool_; 223 scoped_ptr<SSLClientSocketPool> pool_;
224 }; 224 };
225 225
226 INSTANTIATE_TEST_CASE_P( 226 INSTANTIATE_TEST_CASE_P(
227 NextProto, 227 NextProto,
228 SSLClientSocketPoolTest, 228 SSLClientSocketPoolTest,
229 testing::Values(kProtoDeprecatedSPDY2, 229 testing::Values(kProtoDeprecatedSPDY2,
230 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4)); 230 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));
231 231
232 // Make sure that sockets still connect after the leader socket's
233 // connection fails.
234 TEST_P(SSLClientSocketPoolTest, SimultaneousConnectJobsFail) {
235 SSLClientSocket::EnableConnectJobWaiting(true);
236
237 StaticSocketDataProvider data1;
238 StaticSocketDataProvider data2;
239 StaticSocketDataProvider data3;
240 StaticSocketDataProvider data4;
241 StaticSocketDataProvider data5;
242 socket_factory_.AddSocketDataProvider(&data1);
243 socket_factory_.AddSocketDataProvider(&data2);
244 socket_factory_.AddSocketDataProvider(&data3);
245 socket_factory_.AddSocketDataProvider(&data4);
246 socket_factory_.AddSocketDataProvider(&data5);
247 SSLSocketDataProvider ssl(ASYNC, ERR_CONNECTION_FAILED);
248 ssl.is_in_session_cache_ = false;
249 ssl.is_leader_ = true;
250 SSLSocketDataProvider ssl2(ASYNC, OK);
251 ssl2.is_in_session_cache_ = false;
252 ssl2.is_leader_ = false;
253 SSLSocketDataProvider ssl3(ASYNC, OK);
254 ssl3.is_in_session_cache_ = false;
255 ssl3.is_leader_ = false;
256 SSLSocketDataProvider ssl4(ASYNC, OK);
257 ssl4.is_in_session_cache_ = false;
258 ssl4.is_leader_ = false;
259 SSLSocketDataProvider ssl5(ASYNC, OK);
260 ssl.is_in_session_cache_ = false;
261 ssl.is_leader_ = false;
262
263 socket_factory_.AddSSLSocketDataProvider(&ssl);
264 socket_factory_.AddSSLSocketDataProvider(&ssl2);
265 socket_factory_.AddSSLSocketDataProvider(&ssl3);
266 socket_factory_.AddSSLSocketDataProvider(&ssl4);
267 socket_factory_.AddSSLSocketDataProvider(&ssl5);
268
269 CreatePool(true, false, false);
270 scoped_refptr<SSLSocketParams> params1 =
271 SSLParams(ProxyServer::SCHEME_DIRECT, false);
272 scoped_refptr<SSLSocketParams> params2 =
273 SSLParams(ProxyServer::SCHEME_DIRECT, false);
274 scoped_refptr<SSLSocketParams> params3 =
275 SSLParams(ProxyServer::SCHEME_DIRECT, false);
276 scoped_refptr<SSLSocketParams> params4 =
277 SSLParams(ProxyServer::SCHEME_DIRECT, false);
278 ClientSocketHandle handle1;
279 ClientSocketHandle handle2;
280 ClientSocketHandle handle3;
281 ClientSocketHandle handle4;
282 TestCompletionCallback callback1;
283 TestCompletionCallback callback2;
284 TestCompletionCallback callback3;
285 TestCompletionCallback callback4;
286 handle1.Init(
287 "b", params1, MEDIUM, callback1.callback(), pool_.get(), BoundNetLog());
288 handle2.Init(
289 "b", params2, MEDIUM, callback2.callback(), pool_.get(), BoundNetLog());
290 handle3.Init(
291 "b", params3, MEDIUM, callback3.callback(), pool_.get(), BoundNetLog());
292 handle4.Init(
293 "b", params4, MEDIUM, callback4.callback(), pool_.get(), BoundNetLog());
294
295 callback4.WaitForResult();
296
297 // The leader should not have connected.
298 EXPECT_FALSE(handle1.socket());
299 // Ensure that all sockets following the leader still connected.
300 EXPECT_TRUE(handle2.socket()->IsConnected());
301 EXPECT_TRUE(handle3.socket()->IsConnected());
302 EXPECT_TRUE(handle4.socket()->IsConnected());
303 }
304
305 // Make sure that no sockets connect before the "leader" socket,
306 // given that the leader has a successful connection.
307 TEST_P(SSLClientSocketPoolTest, SimultaneousConnectJobsSuccess) {
308 SSLClientSocket::EnableConnectJobWaiting(true);
309
310 StaticSocketDataProvider data1;
311 StaticSocketDataProvider data2;
312 StaticSocketDataProvider data3;
313 StaticSocketDataProvider data4;
314 socket_factory_.AddSocketDataProvider(&data1);
315 socket_factory_.AddSocketDataProvider(&data2);
316 socket_factory_.AddSocketDataProvider(&data3);
317 socket_factory_.AddSocketDataProvider(&data4);
318 SSLSocketDataProvider ssl(ASYNC, OK);
319 ssl.is_in_session_cache_ = false;
320 ssl.is_leader_ = true;
321 SSLSocketDataProvider ssl2(ASYNC, OK);
322 ssl2.is_in_session_cache_ = false;
323 ssl2.is_leader_ = false;
324 SSLSocketDataProvider ssl3(ASYNC, OK);
325 ssl3.is_in_session_cache_ = false;
326 ssl3.is_leader_ = false;
327 SSLSocketDataProvider ssl4(ASYNC, OK);
328 ssl4.is_in_session_cache_ = false;
329 ssl4.is_leader_ = false;
330
331 socket_factory_.AddSSLSocketDataProvider(&ssl);
332 socket_factory_.AddSSLSocketDataProvider(&ssl2);
333 socket_factory_.AddSSLSocketDataProvider(&ssl3);
334 socket_factory_.AddSSLSocketDataProvider(&ssl4);
335
336 CreatePool(true, false, false);
337 scoped_refptr<SSLSocketParams> params1 =
338 SSLParams(ProxyServer::SCHEME_DIRECT, false);
339 scoped_refptr<SSLSocketParams> params2 =
340 SSLParams(ProxyServer::SCHEME_DIRECT, false);
341 scoped_refptr<SSLSocketParams> params3 =
342 SSLParams(ProxyServer::SCHEME_DIRECT, false);
343 scoped_refptr<SSLSocketParams> params4 =
344 SSLParams(ProxyServer::SCHEME_DIRECT, false);
345 ClientSocketHandle handle1;
346 ClientSocketHandle handle2;
347 ClientSocketHandle handle3;
348 ClientSocketHandle handle4;
349 TestCompletionCallback callback1;
350 TestCompletionCallback callback2;
351 TestCompletionCallback callback3;
352 TestCompletionCallback callback4;
353 handle1.Init(
354 "b", params1, MEDIUM, callback1.callback(), pool_.get(), BoundNetLog());
355 handle2.Init(
356 "b", params2, MEDIUM, callback2.callback(), pool_.get(), BoundNetLog());
357 handle3.Init(
358 "b", params3, MEDIUM, callback3.callback(), pool_.get(), BoundNetLog());
359 handle4.Init(
360 "b", params4, MEDIUM, callback4.callback(), pool_.get(), BoundNetLog());
361
362 callback4.WaitForResult();
363
364 std::vector<MockSSLClientSocket*> sockets =
365 socket_factory_.GetSSLClientSockets();
366 for (std::vector<MockSSLClientSocket*>::iterator it = sockets.begin();
367 it != sockets.end();
368 ++it)
369 EXPECT_TRUE((*it)->IsGoodOrdering());
370
371 EXPECT_TRUE(handle1.socket());
372 EXPECT_TRUE(handle2.socket());
373 }
374
232 TEST_P(SSLClientSocketPoolTest, TCPFail) { 375 TEST_P(SSLClientSocketPoolTest, TCPFail) {
233 StaticSocketDataProvider data; 376 StaticSocketDataProvider data;
234 data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED)); 377 data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED));
235 socket_factory_.AddSocketDataProvider(&data); 378 socket_factory_.AddSocketDataProvider(&data);
236 379
237 CreatePool(true /* tcp pool */, false, false); 380 CreatePool(true /* tcp pool */, false, false);
238 scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT, 381 scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
239 false); 382 false);
240 383
241 ClientSocketHandle handle; 384 ClientSocketHandle handle;
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 ssl.channel_id_sent = true; 1072 ssl.channel_id_sent = true;
930 ssl.SetNextProto(GetParam()); 1073 ssl.SetNextProto(GetParam());
931 TestIPPoolingDisabled(&ssl); 1074 TestIPPoolingDisabled(&ssl);
932 } 1075 }
933 1076
934 // It would be nice to also test the timeouts in SSLClientSocketPool. 1077 // It would be nice to also test the timeouts in SSLClientSocketPool.
935 1078
936 } // namespace 1079 } // namespace
937 1080
938 } // namespace net 1081 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698