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

Unified Diff: components/scheduler/base/task_queue_manager_unittest.cc

Issue 2155143002: Fix a bug that could occasionaly cause setInterval to stop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ClearExpiredWakeups tweak. Created 4 years, 5 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
« no previous file with comments | « components/scheduler/base/task_queue_impl.cc ('k') | components/scheduler/base/time_domain.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/scheduler/base/task_queue_manager_unittest.cc
diff --git a/components/scheduler/base/task_queue_manager_unittest.cc b/components/scheduler/base/task_queue_manager_unittest.cc
index 89493b12c65e8313f767728585b892f74d019065..4332c94bc4a65949926156c7b75e59288fb11ee7 100644
--- a/components/scheduler/base/task_queue_manager_unittest.cc
+++ b/components/scheduler/base/task_queue_manager_unittest.cc
@@ -445,7 +445,8 @@ TEST_F(TaskQueueManagerTest, ManualPumping) {
EXPECT_TRUE(runners_[0]->HasPendingImmediateWork());
// After pumping the task runs normally.
- runners_[0]->PumpQueue(true);
+ LazyNow lazy_now(now_src_.get());
+ runners_[0]->PumpQueue(&lazy_now, true);
EXPECT_TRUE(test_task_runner_->HasPendingTasks());
test_task_runner_->RunUntilIdle();
EXPECT_THAT(run_order, ElementsAre(1));
@@ -527,13 +528,15 @@ TEST_F(TaskQueueManagerTest, ManualPumpingWithDelayedTask) {
delay);
// After pumping but before the delay period has expired, task does not run.
- runners_[0]->PumpQueue(true);
+ LazyNow lazy_now1(now_src_.get());
+ runners_[0]->PumpQueue(&lazy_now1, true);
test_task_runner_->RunForPeriod(base::TimeDelta::FromMilliseconds(5));
EXPECT_TRUE(run_order.empty());
// Once the delay has expired, pumping causes the task to run.
now_src_->Advance(base::TimeDelta::FromMilliseconds(5));
- runners_[0]->PumpQueue(true);
+ LazyNow lazy_now2(now_src_.get());
+ runners_[0]->PumpQueue(&lazy_now2, true);
EXPECT_TRUE(test_task_runner_->HasPendingTasks());
test_task_runner_->RunPendingTasks();
EXPECT_THAT(run_order, ElementsAre(1));
@@ -561,7 +564,8 @@ TEST_F(TaskQueueManagerTest, ManualPumpingWithMultipleDelayedTasks) {
EXPECT_TRUE(run_order.empty());
// Once the delay has expired, pumping causes the task to run.
- runners_[0]->PumpQueue(true);
+ LazyNow lazy_now(now_src_.get());
+ runners_[0]->PumpQueue(&lazy_now, true);
test_task_runner_->RunUntilIdle();
EXPECT_THAT(run_order, ElementsAre(1, 2));
}
@@ -586,10 +590,11 @@ TEST_F(TaskQueueManagerTest, ManualPumpingWithNonEmptyWorkQueue) {
std::vector<EnqueueOrder> run_order;
// Posting two tasks and pumping twice should result in two tasks in the work
// queue.
+ LazyNow lazy_now(now_src_.get());
runners_[0]->PostTask(FROM_HERE, base::Bind(&TestTask, 1, &run_order));
- runners_[0]->PumpQueue(true);
+ runners_[0]->PumpQueue(&lazy_now, true);
runners_[0]->PostTask(FROM_HERE, base::Bind(&TestTask, 2, &run_order));
- runners_[0]->PumpQueue(true);
+ runners_[0]->PumpQueue(&lazy_now, true);
EXPECT_EQ(2u, runners_[0]->immediate_work_queue()->Size());
}
@@ -756,7 +761,8 @@ TEST_F(TaskQueueManagerTest,
// This still shouldn't wake TQM as manual queue was not pumped.
EXPECT_TRUE(run_order.empty());
- runners_[1]->PumpQueue(true);
+ LazyNow lazy_now(now_src_.get());
+ runners_[1]->PumpQueue(&lazy_now, true);
test_task_runner_->RunUntilIdle();
// Executing a task on an auto pumped queue should wake the TQM.
EXPECT_THAT(run_order, ElementsAre(2, 1));
@@ -1089,7 +1095,8 @@ TEST_F(TaskQueueManagerTest, HasPendingImmediateWork) {
EXPECT_FALSE(queue0->HasPendingImmediateWork());
EXPECT_TRUE(queue1->HasPendingImmediateWork());
- queue1->PumpQueue(true);
+ LazyNow lazy_now(now_src_.get());
+ queue1->PumpQueue(&lazy_now, true);
EXPECT_FALSE(queue0->HasPendingImmediateWork());
EXPECT_TRUE(queue1->HasPendingImmediateWork());
@@ -1132,7 +1139,8 @@ TEST_F(TaskQueueManagerTest, HasPendingImmediateWorkAndNeedsPumping) {
EXPECT_TRUE(queue1->HasPendingImmediateWork());
EXPECT_TRUE(queue1->NeedsPumping());
- queue1->PumpQueue(true);
+ LazyNow lazy_now(now_src_.get());
+ queue1->PumpQueue(&lazy_now, true);
EXPECT_FALSE(queue0->HasPendingImmediateWork());
EXPECT_FALSE(queue0->NeedsPumping());
EXPECT_TRUE(queue1->HasPendingImmediateWork());
« no previous file with comments | « components/scheduler/base/task_queue_impl.cc ('k') | components/scheduler/base/time_domain.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698