diff options
author | gavinp <gavinp@chromium.org> | 2014-11-09 13:43:18 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-09 21:43:37 +0000 |
commit | 1694addd2c0b173a6a95ce675b7c38a268eddba4 (patch) | |
tree | 97ffc7d792bafdfe20f04f29a0e85565c35f6bb2 | |
parent | 43879d87096b85a70df3482a30018dc5d4ecde44 (diff) | |
download | chromium_src-1694addd2c0b173a6a95ce675b7c38a268eddba4.zip chromium_src-1694addd2c0b173a6a95ce675b7c38a268eddba4.tar.gz chromium_src-1694addd2c0b173a6a95ce675b7c38a268eddba4.tar.bz2 |
Remove FileTest.MemoryCorruption death test regexp assertions.
The stacks on the 8011 builders don't include debug crash messages
apparently; so the FileTest.MemoryCorruption unit tests were causing
failures on those builders.
Removing all the assertions should fix those builders at the cost of losing
a bit of test specificity.
TBR=pucchakayala@chromium.org,thakis@chromium.org
BUG=431425
Review URL: https://codereview.chromium.org/711973002
Cr-Commit-Position: refs/heads/master@{#303408}
-rw-r--r-- | base/files/file_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/base/files/file_unittest.cc b/base/files/file_unittest.cc index 9f57974..3bc2db6 100644 --- a/base/files/file_unittest.cc +++ b/base/files/file_unittest.cc @@ -476,7 +476,7 @@ TEST(FileTest, MemoryCorruption) { EXPECT_NE(file.file_.file_memory_checksum_, implicit_cast<unsigned int>(file.GetPlatformFile())); file.file_.file_memory_checksum_ = file.GetPlatformFile(); - EXPECT_DEATH(file.IsValid(), "corrupted fd memory"); + EXPECT_DEATH(file.IsValid(), ""); file.file_.UpdateChecksum(); // Do not crash on File::~File(). } @@ -485,7 +485,7 @@ TEST(FileTest, MemoryCorruption) { // Test that changing the file descriptor value is detected. base::File file; file.file_.file_.reset(17); - EXPECT_DEATH(file.IsValid(), "corrupted fd memory"); + EXPECT_DEATH(file.IsValid(), ""); // Do not crash on File::~File(). ignore_result(file.file_.file_.release()); @@ -496,7 +496,7 @@ TEST(FileTest, MemoryCorruption) { // Test that GetPlatformFile() checks for corruption. base::File file; file.file_.file_memory_checksum_ = file.GetPlatformFile(); - EXPECT_DEATH(file.GetPlatformFile(), "corrupted fd memory"); + EXPECT_DEATH(file.GetPlatformFile(), ""); file.file_.UpdateChecksum(); // Do not crash on File::~File(). } @@ -505,7 +505,7 @@ TEST(FileTest, MemoryCorruption) { // Test that the base::File destructor checks for corruption. scoped_ptr<base::File> file(new File()); file->file_.file_memory_checksum_ = file->GetPlatformFile(); - EXPECT_DEATH(file.reset(), "corrupted fd memory"); + EXPECT_DEATH(file.reset(), ""); // Do not crash on this thread's destructor call. file->file_.UpdateChecksum(); @@ -515,7 +515,7 @@ TEST(FileTest, MemoryCorruption) { // Test that the base::File constructor checks for corruption. base::File file; file.file_.file_memory_checksum_ = file.GetPlatformFile(); - EXPECT_DEATH(File f(file.Pass()), "corrupted fd memory"); + EXPECT_DEATH(File f(file.Pass()), ""); file.file_.UpdateChecksum(); // Do not crash on File::~File(). } @@ -525,10 +525,10 @@ TEST(FileTest, MemoryCorruption) { base::File file; file.file_.file_.reset(17); // A fake open FD value. - EXPECT_DEATH(file.Seek(File::FROM_BEGIN, 0), "corrupted fd memory"); - EXPECT_DEATH(file.Read(0, NULL, 0), "corrupted fd memory"); - EXPECT_DEATH(file.ReadAtCurrentPos(NULL, 0), "corrupted fd memory"); - EXPECT_DEATH(file.Write(0, NULL, 0), "corrupted fd memory"); + EXPECT_DEATH(file.Seek(File::FROM_BEGIN, 0), ""); + EXPECT_DEATH(file.Read(0, NULL, 0), ""); + EXPECT_DEATH(file.ReadAtCurrentPos(NULL, 0), ""); + EXPECT_DEATH(file.Write(0, NULL, 0), ""); ignore_result(file.file_.file_.release()); file.file_.UpdateChecksum(); |