chrome/browser/chromeos/policy/system_log_uploader_unittest.cc - Issue 2296923003: Make TestSimpleTaskRunner thread-safe.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/policy/system_log_uploader_unittest.cc

Issue 2296923003: Make TestSimpleTaskRunner thread-safe. (Closed)

Patch Set: fix asan error Created 4 years, 3 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

« base/test/test_simple_task_runner.h ('K') | « chrome/browser/chromeos/policy/status_uploader_unittest.cc ('k') | components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/system_log_uploader_unittest.cc

diff --git a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc

index 46f350f0773c61eff9308532e6fbe93e7339eff7..02db1f21cbdc131c754eccc3cb99e40565ca250d 100644

--- a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc

+++ b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc

@@ -162,7 +162,7 @@ class SystemLogUploaderTest : public testing::Test {

task_runner_->RunPendingTasks();

// The previous task should have uploaded another log upload task.

- EXPECT_EQ(1U, task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1U, task_runner_->NumPendingTasks());

CheckPendingTaskDelay(uploader, expected_delay);

}

@@ -207,7 +207,7 @@ TEST_F(SystemLogUploaderTest, SuccessTest) {

settings_helper_.SetBoolean(chromeos::kSystemLogUploadEnabled, true);

SystemLogUploader uploader(std::move(syslog_delegate), task_runner_);

- EXPECT_EQ(1U, task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1U, task_runner_->NumPendingTasks());

RunPendingUploadTaskAndCheckNext(

uploader, base::TimeDelta::FromMilliseconds(

@@ -224,7 +224,7 @@ TEST_F(SystemLogUploaderTest, ThreeFailureTest) {

settings_helper_.SetBoolean(chromeos::kSystemLogUploadEnabled, true);

SystemLogUploader uploader(std::move(syslog_delegate), task_runner_);

- EXPECT_EQ(1U, task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1U, task_runner_->NumPendingTasks());

// Do not retry two times consequentially.

RunPendingUploadTaskAndCheckNext(uploader,

@@ -251,7 +251,7 @@ TEST_F(SystemLogUploaderTest, CheckHeaders) {

settings_helper_.SetBoolean(chromeos::kSystemLogUploadEnabled, true);

SystemLogUploader uploader(std::move(syslog_delegate), task_runner_);

- EXPECT_EQ(1U, task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1U, task_runner_->NumPendingTasks());

RunPendingUploadTaskAndCheckNext(

uploader, base::TimeDelta::FromMilliseconds(

@@ -269,7 +269,7 @@ TEST_F(SystemLogUploaderTest, DisableLogUpload) {

mock_delegate->set_upload_allowed(true);

SystemLogUploader uploader(std::move(syslog_delegate), task_runner_);

- EXPECT_EQ(1U, task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1U, task_runner_->NumPendingTasks());

RunPendingUploadTaskAndCheckNext(uploader,

base::TimeDelta::FromMilliseconds(

SystemLogUploader::kErrorUploadDelayMs));