commit 54aaf9f8b8b36f8546ebefd2cd1f311a48e65649
author gavinp <gavinp@chromium.org> Mon Nov 10 06:43:18 2014 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 17:55:18 2020 +0900
tree 7a38551254af74282633d97bb78af1e5a45fd0bb
parent 7e6c41ed3735b889f9563010fbd99f460585af36

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}


CrOS-Libchrome-Original-Commit: 1694addd2c0b173a6a95ce675b7c38a268eddba4

base/files/file_unittest.cc

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 @@
     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 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 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 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 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 @@
     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();