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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 363025: Improve the display of LoadLogs when truncation occurs.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Change -1 to be a constant instead Created 11 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/socks_client_socket_unittest.cc ('k') | net/socket/tcp_client_socket_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/socket/ssl_client_socket.h" 5 #include "net/socket/ssl_client_socket.h"
6 6
7 #include "net/base/address_list.h" 7 #include "net/base/address_list.h"
8 #include "net/base/host_resolver.h" 8 #include "net/base/host_resolver.h"
9 #include "net/base/io_buffer.h" 9 #include "net/base/io_buffer.h"
10 #include "net/base/load_log.h" 10 #include "net/base/load_log.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 if (rv == net::ERR_IO_PENDING) 73 if (rv == net::ERR_IO_PENDING)
74 rv = callback.WaitForResult(); 74 rv = callback.WaitForResult();
75 EXPECT_EQ(net::OK, rv); 75 EXPECT_EQ(net::OK, rv);
76 76
77 scoped_ptr<net::SSLClientSocket> sock( 77 scoped_ptr<net::SSLClientSocket> sock(
78 socket_factory_->CreateSSLClientSocket(transport, 78 socket_factory_->CreateSSLClientSocket(transport,
79 server_.kHostName, kDefaultSSLConfig)); 79 server_.kHostName, kDefaultSSLConfig));
80 80
81 EXPECT_FALSE(sock->IsConnected()); 81 EXPECT_FALSE(sock->IsConnected());
82 82
83 scoped_refptr<net::LoadLog> log(new net::LoadLog); 83 scoped_refptr<net::LoadLog> log(new net::LoadLog(net::LoadLog::kUnbounded));
84 rv = sock->Connect(&callback, log); 84 rv = sock->Connect(&callback, log);
85 EXPECT_TRUE(net::LogContains( 85 EXPECT_TRUE(net::LogContains(
86 *log, 0, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_BEGIN)); 86 *log, 0, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_BEGIN));
87 if (rv != net::OK) { 87 if (rv != net::OK) {
88 ASSERT_EQ(net::ERR_IO_PENDING, rv); 88 ASSERT_EQ(net::ERR_IO_PENDING, rv);
89 EXPECT_FALSE(sock->IsConnected()); 89 EXPECT_FALSE(sock->IsConnected());
90 EXPECT_FALSE(net::LogContains( 90 EXPECT_FALSE(net::LogContains(
91 *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END)); 91 *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END));
92 92
93 rv = callback.WaitForResult(); 93 rv = callback.WaitForResult();
(...skipping 23 matching lines...) Expand all
117 if (rv == net::ERR_IO_PENDING) 117 if (rv == net::ERR_IO_PENDING)
118 rv = callback.WaitForResult(); 118 rv = callback.WaitForResult();
119 EXPECT_EQ(net::OK, rv); 119 EXPECT_EQ(net::OK, rv);
120 120
121 scoped_ptr<net::SSLClientSocket> sock( 121 scoped_ptr<net::SSLClientSocket> sock(
122 socket_factory_->CreateSSLClientSocket(transport, 122 socket_factory_->CreateSSLClientSocket(transport,
123 server_.kHostName, kDefaultSSLConfig)); 123 server_.kHostName, kDefaultSSLConfig));
124 124
125 EXPECT_FALSE(sock->IsConnected()); 125 EXPECT_FALSE(sock->IsConnected());
126 126
127 scoped_refptr<net::LoadLog> log(new net::LoadLog); 127 scoped_refptr<net::LoadLog> log(new net::LoadLog(net::LoadLog::kUnbounded));
128 rv = sock->Connect(&callback, log); 128 rv = sock->Connect(&callback, log);
129 EXPECT_TRUE(net::LogContains( 129 EXPECT_TRUE(net::LogContains(
130 *log, 0, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_BEGIN)); 130 *log, 0, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_BEGIN));
131 if (rv != net::OK) { 131 if (rv != net::OK) {
132 ASSERT_EQ(net::ERR_IO_PENDING, rv); 132 ASSERT_EQ(net::ERR_IO_PENDING, rv);
133 EXPECT_FALSE(sock->IsConnected()); 133 EXPECT_FALSE(sock->IsConnected());
134 EXPECT_FALSE(net::LogContains( 134 EXPECT_FALSE(net::LogContains(
135 *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END)); 135 *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END));
136 136
137 rv = callback.WaitForResult(); 137 rv = callback.WaitForResult();
(...skipping 24 matching lines...) Expand all
162 if (rv == net::ERR_IO_PENDING) 162 if (rv == net::ERR_IO_PENDING)
163 rv = callback.WaitForResult(); 163 rv = callback.WaitForResult();
164 EXPECT_EQ(net::OK, rv); 164 EXPECT_EQ(net::OK, rv);
165 165
166 scoped_ptr<net::SSLClientSocket> sock( 166 scoped_ptr<net::SSLClientSocket> sock(
167 socket_factory_->CreateSSLClientSocket(transport, 167 socket_factory_->CreateSSLClientSocket(transport,
168 server_.kMismatchedHostName, kDefaultSSLConfig)); 168 server_.kMismatchedHostName, kDefaultSSLConfig));
169 169
170 EXPECT_FALSE(sock->IsConnected()); 170 EXPECT_FALSE(sock->IsConnected());
171 171
172 scoped_refptr<net::LoadLog> log(new net::LoadLog); 172 scoped_refptr<net::LoadLog> log(new net::LoadLog(net::LoadLog::kUnbounded));
173 rv = sock->Connect(&callback, log); 173 rv = sock->Connect(&callback, log);
174 EXPECT_TRUE(net::LogContains( 174 EXPECT_TRUE(net::LogContains(
175 *log, 0, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_BEGIN)); 175 *log, 0, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_BEGIN));
176 if (rv != net::ERR_CERT_COMMON_NAME_INVALID) { 176 if (rv != net::ERR_CERT_COMMON_NAME_INVALID) {
177 ASSERT_EQ(net::ERR_IO_PENDING, rv); 177 ASSERT_EQ(net::ERR_IO_PENDING, rv);
178 EXPECT_FALSE(sock->IsConnected()); 178 EXPECT_FALSE(sock->IsConnected());
179 EXPECT_FALSE(net::LogContains( 179 EXPECT_FALSE(net::LogContains(
180 *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END)); 180 *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END));
181 181
182 rv = callback.WaitForResult(); 182 rv = callback.WaitForResult();
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 // Do a partial read and then exit. This test should not crash! 355 // Do a partial read and then exit. This test should not crash!
356 scoped_refptr<net::IOBuffer> buf = new net::IOBuffer(512); 356 scoped_refptr<net::IOBuffer> buf = new net::IOBuffer(512);
357 rv = sock->Read(buf, 512, &callback); 357 rv = sock->Read(buf, 512, &callback);
358 EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING); 358 EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
359 359
360 if (rv == net::ERR_IO_PENDING) 360 if (rv == net::ERR_IO_PENDING)
361 rv = callback.WaitForResult(); 361 rv = callback.WaitForResult();
362 362
363 EXPECT_NE(rv, 0); 363 EXPECT_NE(rv, 0);
364 } 364 }
OLDNEW
« no previous file with comments | « net/socket/socks_client_socket_unittest.cc ('k') | net/socket/tcp_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698