summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorbrucedawson <brucedawson@chromium.org>2015-09-10 10:43:04 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-10 17:43:47 +0000
commit25f5293d49233cd48b94ea921f1ad26cd53be7f9 (patch)
treed81cc7beadc5ba146dd250e639f10e0d096df201 /net
parent81abdf24465d84e2304b8245d2f51400436ce2e8 (diff)
downloadchromium_src-25f5293d49233cd48b94ea921f1ad26cd53be7f9.zip
chromium_src-25f5293d49233cd48b94ea921f1ad26cd53be7f9.tar.gz
chromium_src-25f5293d49233cd48b94ea921f1ad26cd53be7f9.tar.bz2
Stop net_unittests from crashing on OpenEntry failures
Even unit tests should avoid crashing, to avoid complicating failures. This fixes a pair of crashes that were seen when running net_unittests when built with VS 2015. R=rvargas@chromium.org BUG=528394 Review URL: https://codereview.chromium.org/1320303008 Cr-Commit-Position: refs/heads/master@{#348179}
Diffstat (limited to 'net')
-rw-r--r--net/disk_cache/backend_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc
index 3739676..8ea080a 100644
--- a/net/disk_cache/backend_unittest.cc
+++ b/net/disk_cache/backend_unittest.cc
@@ -1908,8 +1908,8 @@ TEST_F(DiskCacheTest, SimpleCacheControlRestart) {
disk_cache::Entry* entry = NULL;
rv = cache->OpenEntry(kExistingEntryKey, &entry, cb.callback());
- EXPECT_EQ(net::OK, cb.GetResult(rv));
- EXPECT_TRUE(entry);
+ ASSERT_EQ(net::OK, cb.GetResult(rv));
+ EXPECT_NE(nullptr, entry);
entry->Close();
}
}
@@ -1949,8 +1949,8 @@ TEST_F(DiskCacheTest, SimpleCacheControlLeave) {
disk_cache::Entry* entry = NULL;
rv = cache->OpenEntry(kExistingEntryKey, &entry, cb.callback());
- EXPECT_EQ(net::OK, cb.GetResult(rv));
- EXPECT_TRUE(entry);
+ ASSERT_EQ(net::OK, cb.GetResult(rv));
+ EXPECT_NE(nullptr, entry);
entry->Close();
}
}