commit 6e8c54b2f87df76281f43558c24f101c30622d32
author Christopher Wiley <wiley@chromium.org> Wed Aug 15 16:12:30 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Aug 17 14:33:58 2012 -0700
tree 025c65783cae98dbc234ac58ab144d5bef8e9bb9
parent cf199de9b7c813635b5247a1858a99ab1fc9e21b

shill: Catch CHECK log messages through LOG_STREAM

Remove the log handler installed by MemoryLog and catch CHECK-esque log
messages by redefining the LOG_STREAM macro instead.

BUG=chromium-os:31145
TEST=Unit tests

Change-Id: I2462a1a0718b5c6f0b5a1a5d4a46ec23268434b5
Reviewed-on: https://gerrit.chromium.org/gerrit/30478
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Gary Morain <gmorain@chromium.org>
Commit-Ready: Christopher Wiley <wiley@chromium.org>

memory_log_unittest.cc

diff --git a/memory_log_unittest.cc b/memory_log_unittest.cc
index 88d4afe..dab7a3f 100644
--- a/memory_log_unittest.cc
+++ b/memory_log_unittest.cc
@@ -38,6 +38,8 @@
   }
 };
 
+class MemoryLogDeathTest : public testing::Test { };
+
 TEST_F(MemoryLogTest, ScopedLoggerStillWorks) {
   ScopedMockLog log;
   EXPECT_CALL(log, Log(_, _, kTestStr1));
@@ -64,6 +66,12 @@
   LOG_IF(WARNING, strlen("two") == 3) << kTestStr2;
 }
 
+// Test that no matter what we did, CHECK still kills the process.
+TEST_F(MemoryLogDeathTest, CheckLogsStillWork) {
+  EXPECT_DEATH( { CHECK(false) << "diediedie"; },
+                "Check failed: false. diediedie");
+}
+
 TEST_F(MemoryLogTest, MemoryLogIsLogging) {
   ScopedMockLog log;
   EXPECT_CALL(log, Log(_, _, kTestStr1));
@@ -133,36 +141,23 @@
   EXPECT_TRUE(temp_dir.Delete());
 }
 
-// Test that messages we're logging that don't go through the MessageLog still
-// end up in the message log when we have our handler installed.
+// Test that most messages go through MemoryLog
 TEST_F(MemoryLogTest, MemoryLogMessageInterceptorWorks) {
   ASSERT_EQ(0, MemoryLog::GetInstance()->TestGetNumberMessages());
-  // Have to use this weird syntax because most normal macros wind up logging
-  // via LOG, thus getting sent through MemoryLog.
-  LOG_STREAM(ERROR) << "Doesn't get caught";
-  ASSERT_EQ(0, MemoryLog::GetInstance()->TestGetNumberMessages());
-  MemoryLog::InstallLogInterceptor();
-  LOG_STREAM(ERROR) << "Caught this one!";
-  ASSERT_EQ(1, MemoryLog::GetInstance()->TestGetNumberMessages());
   // Make sure we're not double logging.
   LOG(ERROR) << kTestStr1;
-  ASSERT_EQ(2, MemoryLog::GetInstance()->TestGetNumberMessages());
-  // SLOG_IF works with the intercepting handler.
+  ASSERT_EQ(1, MemoryLog::GetInstance()->TestGetNumberMessages());
   SLOG_IF(WiFi, 3, strlen("two") == 3) << kTestStr2;
-  ASSERT_EQ(3, MemoryLog::GetInstance()->TestGetNumberMessages());
+  ASSERT_EQ(2, MemoryLog::GetInstance()->TestGetNumberMessages());
   SLOG_IF(WiFi, 3, strlen("one") == 2) << "does not get through again";
-  ASSERT_EQ(3, MemoryLog::GetInstance()->TestGetNumberMessages());
-  // Similarly, LOG_IF works with the handler.
+  ASSERT_EQ(2, MemoryLog::GetInstance()->TestGetNumberMessages());
   LOG_IF(ERROR, strlen("two") == 3) << kTestStr2;
-  ASSERT_EQ(4, MemoryLog::GetInstance()->TestGetNumberMessages());
+  ASSERT_EQ(3, MemoryLog::GetInstance()->TestGetNumberMessages());
   LOG_IF(ERROR, strlen("one") == 2) << "does not get through again";
+  ASSERT_EQ(3, MemoryLog::GetInstance()->TestGetNumberMessages());
+  NOTIMPLEMENTED();
   ASSERT_EQ(4, MemoryLog::GetInstance()->TestGetNumberMessages());
-  MemoryLog::UninstallLogInterceptor();
-  LOG_STREAM(ERROR) << "Doesn't get caught";
-  ASSERT_EQ(4, MemoryLog::GetInstance()->TestGetNumberMessages());
-  // Normal log messages still get through.
-  LOG(ERROR) << kTestStr2;
-  ASSERT_EQ(5, MemoryLog::GetInstance()->TestGetNumberMessages());
+
 }
 
 }  // namespace shill