crash-reporter: when exe symlink read fails send diags and still ignore chrome crashes

user_collector_test.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <unistd.h>
 
 #include "base/file_util.h"
 #include "crash-reporter/system_logging_mock.h"
 #include "crash-reporter/user_collector.h"
 #include "crash-reporter/test_helpers.h"
@@ skipping 140 matching lines @@
   s_metrics = true;
   collector_.HandleCrash("5:2:ignored", "chrome");
   ASSERT_NE(std::string::npos,
             logging_.log().find(
                 "Received crash notification for chrome[5] sig 2"));
   ASSERT_NE(std::string::npos,
             logging_.log().find("(ignoring - chrome crash)"));
   ASSERT_EQ(s_crashes, 0);
 }
 
+TEST_F(UserCollectorTest, HandleSuppliedChromeCrashWithMetrics) {
+  s_metrics = true;
+  collector_.HandleCrash("0:2:chrome", NULL);
+  ASSERT_NE(std::string::npos,
+            logging_.log().find(
+                "Received crash notification for supplied_chrome[0] sig 2"));
+  ASSERT_NE(std::string::npos,
+            logging_.log().find("(ignoring - chrome crash)"));
+  ASSERT_EQ(s_crashes, 0);
+}
+
 TEST_F(UserCollectorTest, GetProcessPath) {
   FilePath path = collector_.GetProcessPath(100);
   ASSERT_EQ("/proc/100", path.value());
 }
 
 TEST_F(UserCollectorTest, GetSymlinkTarget) {
   FilePath result;
   ASSERT_FALSE(collector_.GetSymlinkTarget(FilePath("/does_not_exist"),
                                            &result));
-
+  ASSERT_NE(std::string::npos,
+            logging_.log().find(
+                "Readlink failed on /does_not_exist with 2"));
   std::string long_link;
   for (int i = 0; i < 50; ++i)
     long_link += "0123456789";
   long_link += "/gold";
 
   for (size_t len = 1; len <= long_link.size(); ++len) {
     std::string this_link;
     static const char kLink[] = "test/this_link";
     this_link.assign(long_link.c_str(), len);
     ASSERT_EQ(len, this_link.size());
     unlink(kLink);
     ASSERT_EQ(0, symlink(this_link.c_str(), kLink));
     ASSERT_TRUE(collector_.GetSymlinkTarget(FilePath(kLink), &result));
     ASSERT_EQ(this_link, result.value());
   }
 }
 
+TEST_F(UserCollectorTest, GetExecutableBaseNameFromPid) {
+  std::string base_name;
+  EXPECT_FALSE(collector_.GetExecutableBaseNameFromPid(0, &base_name));
+  EXPECT_NE(std::string::npos,
+            logging_.log().find(
+                "Readlink failed on /proc/0/exe with 2"));
+  EXPECT_NE(std::string::npos,
+            logging_.log().find(
+                "GetSymlinkTarget failed - Path "
+                "/proc/0 DirectoryExists: 0"));
+  EXPECT_NE(std::string::npos,
+            logging_.log().find(
+                "stat /proc/0/exe failed: -1 2"));
+
+  logging_.clear();
+  pid_t my_pid = getpid();
+  EXPECT_TRUE(collector_.GetExecutableBaseNameFromPid(my_pid, &base_name));
+  EXPECT_EQ(std::string::npos,
+            logging_.log().find(
+                "Readlink failed"));
+  EXPECT_EQ("user_collector_test", base_name);
+}
+
 TEST_F(UserCollectorTest, GetIdFromStatus) {
   int id = 1;
   EXPECT_FALSE(collector_.GetIdFromStatus(UserCollector::kUserId,
                                           UserCollector::kIdEffective,
                                           "nothing here",
                                           &id));
   EXPECT_EQ(id, 1);
 
   // Not enough parameters.
   EXPECT_FALSE(collector_.GetIdFromStatus(UserCollector::kUserId,
@@ skipping 104 matching lines @@
     EXPECT_EQ(expectations[i].exists,
               file_util::PathExists(
                   container_path.Append(expectations[i].name)));
   }
 }
 
 int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }