Skip to content

Commit 9e91f53

Browse files
authored
Merge pull request ceph#55760 from cbodley/wip-64568
test/rgw: increase timeouts in unittest_rgw_dmclock_scheduler Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2 parents f336a5d + b4f3ddf commit 9e91f53

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/test/rgw/test_rgw_dmclock_scheduler.cc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ TEST(Queue, RateLimit)
105105
EXPECT_EQ(1u, counters(client_id::admin)->get(queue_counters::l_qlen));
106106
EXPECT_EQ(1u, counters(client_id::auth)->get(queue_counters::l_qlen));
107107

108-
context.run_for(std::chrono::milliseconds(1));
108+
context.run_for(std::chrono::milliseconds(50));
109109
EXPECT_TRUE(context.stopped());
110110

111111
ASSERT_TRUE(ec1);
@@ -163,7 +163,7 @@ TEST(Queue, AsyncRequest)
163163
EXPECT_EQ(1u, counters(client_id::admin)->get(queue_counters::l_qlen));
164164
EXPECT_EQ(1u, counters(client_id::auth)->get(queue_counters::l_qlen));
165165

166-
context.run_for(std::chrono::milliseconds(1));
166+
context.run_for(std::chrono::milliseconds(50));
167167
EXPECT_TRUE(context.stopped());
168168

169169
ASSERT_TRUE(ec1);
@@ -217,7 +217,7 @@ TEST(Queue, Cancel)
217217
EXPECT_FALSE(ec1);
218218
EXPECT_FALSE(ec2);
219219

220-
context.run_for(std::chrono::milliseconds(1));
220+
context.run_for(std::chrono::milliseconds(50));
221221
EXPECT_TRUE(context.stopped());
222222

223223
ASSERT_TRUE(ec1);
@@ -265,7 +265,7 @@ TEST(Queue, CancelClient)
265265
EXPECT_FALSE(ec1);
266266
EXPECT_FALSE(ec2);
267267

268-
context.run_for(std::chrono::milliseconds(1));
268+
context.run_for(std::chrono::milliseconds(50));
269269
EXPECT_TRUE(context.stopped());
270270

271271
ASSERT_TRUE(ec1);
@@ -315,7 +315,7 @@ TEST(Queue, CancelOnDestructor)
315315
EXPECT_FALSE(ec1);
316316
EXPECT_FALSE(ec2);
317317

318-
context.run_for(std::chrono::milliseconds(1));
318+
context.run_for(std::chrono::milliseconds(50));
319319
EXPECT_TRUE(context.stopped());
320320

321321
ASSERT_TRUE(ec1);
@@ -369,20 +369,20 @@ TEST(Queue, CrossExecutorRequest)
369369
EXPECT_EQ(1u, counters(client_id::admin)->get(queue_counters::l_qlen));
370370
EXPECT_EQ(1u, counters(client_id::auth)->get(queue_counters::l_qlen));
371371

372-
callback_context.run_for(std::chrono::milliseconds(1));
372+
callback_context.poll();
373373
// maintains work on callback executor while in queue
374374
EXPECT_FALSE(callback_context.stopped());
375375

376376
EXPECT_FALSE(ec1);
377377
EXPECT_FALSE(ec2);
378378

379-
queue_context.run_for(std::chrono::milliseconds(1));
379+
queue_context.run_for(std::chrono::milliseconds(50));
380380
EXPECT_TRUE(queue_context.stopped());
381381

382382
EXPECT_FALSE(ec1); // no callbacks until callback executor runs
383383
EXPECT_FALSE(ec2);
384384

385-
callback_context.run_for(std::chrono::milliseconds(1));
385+
callback_context.run_for(std::chrono::milliseconds(50));
386386
EXPECT_TRUE(callback_context.stopped());
387387

388388
ASSERT_TRUE(ec1);
@@ -421,7 +421,7 @@ TEST(Queue, SpawnAsyncRequest)
421421
EXPECT_EQ(PhaseType::priority, p2);
422422
});
423423

424-
context.run_for(std::chrono::milliseconds(1));
424+
context.run_for(std::chrono::milliseconds(50));
425425
EXPECT_TRUE(context.stopped());
426426
}
427427

0 commit comments

Comments
 (0)