diff options
author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 19:59:36 +0000 |
---|---|---|
committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 19:59:36 +0000 |
commit | 60c4c41ce3ed1fa0697daf274233d84febf6233c (patch) | |
tree | 7b6bfe29f7b6526b4c63ce49ab7a7ffcd20d3bbf /net/socket/socks_client_socket_unittest.cc | |
parent | 3203c5e35bba5266fe1d149875c3a9815ee9c214 (diff) | |
download | chromium_src-60c4c41ce3ed1fa0697daf274233d84febf6233c.zip chromium_src-60c4c41ce3ed1fa0697daf274233d84febf6233c.tar.gz chromium_src-60c4c41ce3ed1fa0697daf274233d84febf6233c.tar.bz2 |
Improve the display of LoadLogs when truncation occurs.
Rather than drop all subsequent entries, we now preserve the final entry that was appended to the log.
This way, even if entries have been dropped, we can still infer what the total time was, and what the exit condition was.
Also makes LoadLog take the bound as a required parameter.
BUG=none
TEST=LoadLogUtilTest.DisplayOfTruncated
Review URL: http://codereview.chromium.org/363025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket_unittest.cc')
-rw-r--r-- | net/socket/socks_client_socket_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index 56d84a8..6b5c0fb 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -93,7 +93,7 @@ TEST_F(SOCKSClientSocketTest, CompleteHandshake) { EXPECT_TRUE(tcp_sock_->IsConnected()); EXPECT_FALSE(user_sock_->IsConnected()); - scoped_refptr<LoadLog> log(new LoadLog); + scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded)); int rv = user_sock_->Connect(&callback_, log); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_TRUE( @@ -154,7 +154,7 @@ TEST_F(SOCKSClientSocketTest, HandshakeFailures) { MockRead(false, tests[i].fail_reply, arraysize(tests[i].fail_reply)) }; user_sock_.reset(BuildMockSocket(data_reads, data_writes, "localhost", 80)); - scoped_refptr<LoadLog> log(new LoadLog); + scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded)); int rv = user_sock_->Connect(&callback_, log); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -182,7 +182,7 @@ TEST_F(SOCKSClientSocketTest, PartialServerReads) { MockRead(true, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) }; user_sock_.reset(BuildMockSocket(data_reads, data_writes, "localhost", 80)); - scoped_refptr<LoadLog> log(new LoadLog); + scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded)); int rv = user_sock_->Connect(&callback_, log); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -212,7 +212,7 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply)) }; user_sock_.reset(BuildMockSocket(data_reads, data_writes, "localhost", 80)); - scoped_refptr<LoadLog> log(new LoadLog); + scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded)); int rv = user_sock_->Connect(&callback_, log); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -236,7 +236,7 @@ TEST_F(SOCKSClientSocketTest, FailedSocketRead) { MockRead(false, 0) }; user_sock_.reset(BuildMockSocket(data_reads, data_writes, "localhost", 80)); - scoped_refptr<LoadLog> log(new LoadLog); + scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded)); int rv = user_sock_->Connect(&callback_, log); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -265,7 +265,7 @@ TEST_F(SOCKSClientSocketTest, SOCKS4AFailedDNS) { MockRead(false, kSOCKSOkReply, arraysize(kSOCKSOkReply)) }; user_sock_.reset(BuildMockSocket(data_reads, data_writes, hostname, 80)); - scoped_refptr<LoadLog> log(new LoadLog); + scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded)); int rv = user_sock_->Connect(&callback_, log); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -296,7 +296,7 @@ TEST_F(SOCKSClientSocketTest, SOCKS4AIfDomainInIPv6) { MockRead(false, kSOCKSOkReply, arraysize(kSOCKSOkReply)) }; user_sock_.reset(BuildMockSocket(data_reads, data_writes, hostname, 80)); - scoped_refptr<LoadLog> log(new LoadLog); + scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded)); int rv = user_sock_->Connect(&callback_, log); EXPECT_EQ(ERR_IO_PENDING, rv); |