Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(508)

Unified Diff: chromecast/crash/linux/synchronized_minidump_manager_unittest.cc

Issue 2203123003: [Chromecast] Remove usage of nonreentrant functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Cleanup Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/crash/linux/synchronized_minidump_manager_unittest.cc
diff --git a/chromecast/crash/linux/synchronized_minidump_manager_unittest.cc b/chromecast/crash/linux/synchronized_minidump_manager_unittest.cc
index 5fa5a79b7e00994fd97548ebe26da9c6d45b69e2..ce1cfe1182f6327576fe548f16b0e9068fa0e83a 100644
--- a/chromecast/crash/linux/synchronized_minidump_manager_unittest.cc
+++ b/chromecast/crash/linux/synchronized_minidump_manager_unittest.cc
@@ -257,7 +257,7 @@ TEST_F(SynchronizedMinidumpManagerTest,
TEST_F(SynchronizedMinidumpManagerTest,
AddEntryToLockFile_SucceedsWithValidEntries) {
// Sample parameters.
- time_t now = time(0);
+ base::Time now = base::Time::Now();
MinidumpParams params;
params.process_name = "process";
@@ -285,7 +285,7 @@ TEST_F(SynchronizedMinidumpManagerTest,
}
TEST_F(SynchronizedMinidumpManagerTest,
bcf 2016/08/05 03:33:23 Why are we keeping this around?
ameyak 2016/08/05 18:45:06 Initial thought was it would be cleaner to just di
- AcquireLockFile_FailsWhenNonBlockingAndFileLocked) {
+ DISABLED_AcquireLockFile_FailsWhenNonBlockingAndFileLocked) {
ASSERT_TRUE(CreateFiles(lockfile_.value(), metadata_.value()));
// Lock the lockfile here. Note that the Chromium base::File tools permit
// multiple locks on the same process to succeed, so we must use POSIX system
@@ -295,20 +295,18 @@ TEST_F(SynchronizedMinidumpManagerTest,
ASSERT_EQ(0, flock(fd, LOCK_EX));
SynchronizedMinidumpManagerSimple manager;
- manager.set_non_blocking(true);
+ // manager.set_non_blocking(true); This method has been deprecated.
ASSERT_EQ(-1, manager.DoWorkLocked());
ASSERT_FALSE(manager.work_done());
-
// Test that the manager was not able to log the crash dump.
ScopedVector<DumpInfo> dumps;
ASSERT_TRUE(FetchDumps(lockfile_.value(), &dumps));
ASSERT_EQ(0u, dumps.size());
}
-TEST_F(SynchronizedMinidumpManagerTest,
- AcquireLockFile_WaitsForOtherThreadWhenBlocking) {
+TEST_F(SynchronizedMinidumpManagerTest, AcquireLockFile_WaitsForOtherThread) {
// Create some parameters for a minidump.
- time_t now = time(0);
+ base::Time now = base::Time::Now();
MinidumpParams params;
params.process_name = "process";
@@ -337,7 +335,6 @@ TEST_F(SynchronizedMinidumpManagerTest,
SynchronizedMinidumpManagerSimple manager;
manager.SetDumpInfoToWrite(
base::WrapUnique(new DumpInfo("dump", "log", now, params)));
- manager.set_non_blocking(false);
EXPECT_EQ(0, manager.DoWorkLocked());
EXPECT_EQ(0, manager.add_entry_return_code());
@@ -375,10 +372,9 @@ TEST_F(SynchronizedMinidumpManagerTest,
base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(50));
SynchronizedMinidumpManagerSimple manager;
- manager.set_non_blocking(true);
+ // manager.set_non_blocking(true); This method has been deprecated.
ASSERT_EQ(-1, manager.DoWorkLocked());
ASSERT_FALSE(manager.work_done());
-
// Test that the manager was not able to log the crash dump.
ScopedVector<DumpInfo> dumps;
ASSERT_TRUE(FetchDumps(lockfile_.value(), &dumps));
@@ -389,9 +385,9 @@ TEST_F(SynchronizedMinidumpManagerTest,
// of all tests in this thread. Figure out how to lock the file more cleanly
// from another process.
TEST_F(SynchronizedMinidumpManagerTest,
- DISABLED_AcquireLockFile_WaitsForOtherProcessWhenBlocking) {
+ DISABLED_AcquireLockFile_WaitsForOtherProcess) {
// Create some parameters for a minidump.
- time_t now = time(0);
+ base::Time now = base::Time::Now();
MinidumpParams params;
params.process_name = "process";
@@ -421,7 +417,6 @@ TEST_F(SynchronizedMinidumpManagerTest,
SynchronizedMinidumpManagerSimple manager;
manager.SetDumpInfoToWrite(
base::WrapUnique(new DumpInfo("dump", "log", now, params)));
- manager.set_non_blocking(false);
EXPECT_EQ(0, manager.DoWorkLocked());
EXPECT_EQ(0, manager.add_entry_return_code());
@@ -436,7 +431,7 @@ TEST_F(SynchronizedMinidumpManagerTest,
TEST_F(SynchronizedMinidumpManagerTest,
Upload_SucceedsWhenDumpLimitsNotExceeded) {
// Sample parameters.
- time_t now = time(0);
+ base::Time now = base::Time::Now();
MinidumpParams params;
params.process_name = "process";
@@ -452,7 +447,7 @@ TEST_F(SynchronizedMinidumpManagerTest,
TEST_F(SynchronizedMinidumpManagerTest, Upload_FailsWhenTooManyRecentDumps) {
// Sample parameters.
- time_t now = time(0);
+ base::Time now = base::Time::Now();
MinidumpParams params;
params.process_name = "process";
@@ -472,7 +467,7 @@ TEST_F(SynchronizedMinidumpManagerTest, Upload_FailsWhenTooManyRecentDumps) {
TEST_F(SynchronizedMinidumpManagerTest, UploadSucceedsAfterRateLimitPeriodEnd) {
// Sample parameters.
- time_t now = time(0);
+ base::Time now = base::Time::Now();
MinidumpParams params;
params.process_name = "process";
@@ -492,7 +487,9 @@ TEST_F(SynchronizedMinidumpManagerTest, UploadSucceedsAfterRateLimitPeriodEnd) {
ASSERT_EQ(0, uploader.DoWorkLocked());
ASSERT_FALSE(uploader.can_upload_return_val());
- int64_t period = SynchronizedMinidumpManager::kRatelimitPeriodSeconds;
+ base::TimeDelta period = base::TimeDelta::FromSeconds(
+ SynchronizedMinidumpManager::kRatelimitPeriodSeconds);
+ base::Time now = base::Time::Now();
// Half period shouldn't trigger reset
produce_dumps(producer, 1);
@@ -515,7 +512,7 @@ TEST_F(SynchronizedMinidumpManagerTest, HasDumpsWithoutDumps) {
TEST_F(SynchronizedMinidumpManagerTest, HasDumpsWithDumps) {
// Sample parameters.
- time_t now = time(0);
+ base::Time now = base::Time::Now();
MinidumpParams params;
params.process_name = "process";

Powered by Google App Engine
This is Rietveld 408576698