From 17d6a993fc17d533460c5f40f3908c708e057c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 May 2024 18:45:17 +0200 Subject: Merging upstream version 18.2.3. Signed-off-by: Daniel Baumann --- src/test/rgw/test_rgw_dmclock_scheduler.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/test/rgw/test_rgw_dmclock_scheduler.cc') diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc b/src/test/rgw/test_rgw_dmclock_scheduler.cc index 92800767c..28ae78180 100644 --- a/src/test/rgw/test_rgw_dmclock_scheduler.cc +++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc @@ -105,7 +105,7 @@ TEST(Queue, RateLimit) EXPECT_EQ(1u, counters(client_id::admin)->get(queue_counters::l_qlen)); EXPECT_EQ(1u, counters(client_id::auth)->get(queue_counters::l_qlen)); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -163,7 +163,7 @@ TEST(Queue, AsyncRequest) EXPECT_EQ(1u, counters(client_id::admin)->get(queue_counters::l_qlen)); EXPECT_EQ(1u, counters(client_id::auth)->get(queue_counters::l_qlen)); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -217,7 +217,7 @@ TEST(Queue, Cancel) EXPECT_FALSE(ec1); EXPECT_FALSE(ec2); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -265,7 +265,7 @@ TEST(Queue, CancelClient) EXPECT_FALSE(ec1); EXPECT_FALSE(ec2); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -315,7 +315,7 @@ TEST(Queue, CancelOnDestructor) EXPECT_FALSE(ec1); EXPECT_FALSE(ec2); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -369,20 +369,20 @@ TEST(Queue, CrossExecutorRequest) EXPECT_EQ(1u, counters(client_id::admin)->get(queue_counters::l_qlen)); EXPECT_EQ(1u, counters(client_id::auth)->get(queue_counters::l_qlen)); - callback_context.run_for(std::chrono::milliseconds(1)); + callback_context.poll(); // maintains work on callback executor while in queue EXPECT_FALSE(callback_context.stopped()); EXPECT_FALSE(ec1); EXPECT_FALSE(ec2); - queue_context.run_for(std::chrono::milliseconds(1)); + queue_context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(queue_context.stopped()); EXPECT_FALSE(ec1); // no callbacks until callback executor runs EXPECT_FALSE(ec2); - callback_context.run_for(std::chrono::milliseconds(1)); + callback_context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(callback_context.stopped()); ASSERT_TRUE(ec1); @@ -421,7 +421,7 @@ TEST(Queue, SpawnAsyncRequest) EXPECT_EQ(PhaseType::priority, p2); }); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); } -- cgit v1.2.3