diff options
| author | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 10:44:33 +0000 |
|---|---|---|
| committer | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 10:44:33 +0000 |
| commit | bfb3d2074117da4096a310f9f4d403ea9ecd5214 (patch) | |
| tree | 2cbc359454275cbb4a12a1e50472ece7514fc705 /net | |
| parent | 4582d0f11a8bb1d284243a6aaad2c81cd7b54989 (diff) | |
| download | chromium_src-bfb3d2074117da4096a310f9f4d403ea9ecd5214.zip chromium_src-bfb3d2074117da4096a310f9f4d403ea9ecd5214.tar.gz chromium_src-bfb3d2074117da4096a310f9f4d403ea9ecd5214.tar.bz2 | |
The async handling in StaticMockSocket had a bug - it considers any
MockRead with zero length as a EOF; but it could be a MockRead which
is an error code (where the length is irrelevant).
Allow advancing of the next read over simulated errors.
BUG=none
TEST=a test of the test?
Review URL: http://codereview.chromium.org/421001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/socket_test_util.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index ac9411e..ef10f76 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -277,7 +277,8 @@ int MockSSLClientSocket::Write(net::IOBuffer* buf, int buf_len, MockRead StaticSocketDataProvider::GetNextRead() { MockRead rv = reads_[read_index_]; - if (reads_[read_index_].data_len != 0) + if (reads_[read_index_].result != OK || + reads_[read_index_].data_len != 0) read_index_++; // Don't advance past an EOF. return rv; } |