|
18 | 18 | //============================================================================== |
19 | 19 |
|
20 | 20 | #include "rpc/WorkQueue.hpp" |
21 | | -#include "util/LoggerFixtures.hpp" |
22 | 21 | #include "util/MockAssert.hpp" |
23 | 22 | #include "util/MockPrometheus.hpp" |
24 | 23 | #include "util/config/ConfigDefinition.hpp" |
@@ -58,7 +57,7 @@ struct RPCWorkQueueTestBase : public virtual ::testing::Test { |
58 | 57 | } |
59 | 58 | }; |
60 | 59 |
|
61 | | -struct WorkQueueTest : WithPrometheus, RPCWorkQueueTestBase, LoggerFixture { |
| 60 | +struct WorkQueueTest : WithPrometheus, RPCWorkQueueTestBase { |
62 | 61 | WorkQueueTest() : RPCWorkQueueTestBase(/* workers = */ 4, /* maxQueueSize = */ 2) |
63 | 62 | { |
64 | 63 | } |
@@ -115,7 +114,7 @@ TEST_F(WorkQueueTest, NonWhitelistedPreventSchedulingAtQueueLimitExceeded) |
115 | 114 | EXPECT_TRUE(unblocked); |
116 | 115 | } |
117 | 116 |
|
118 | | -struct WorkQueueDelayedStartTest : WithPrometheus, LoggerFixture { |
| 117 | +struct WorkQueueDelayedStartTest : WithPrometheus { |
119 | 118 | WorkQueue queue{WorkQueue::kDONT_START_PROCESSING_TAG, /* numWorkers = */ 1, /* maxSize = */ 100}; |
120 | 119 | }; |
121 | 120 |
|
@@ -265,9 +264,10 @@ TEST_F(WorkQueueMockPrometheusTest, postCoroCounters) |
265 | 264 | } |
266 | 265 |
|
267 | 266 | // Note: not using EXPECT_CLIO_ASSERT_FAIL because exception is swallowed by the WQ context |
| 267 | +// TODO [https://github.com/XRPLF/clio/issues/2906]: Enable the test once we figure out a better way to do it without |
| 268 | +// using up >2 minutes of CI time |
268 | 269 | struct WorkQueueDeathTest : WorkQueueMockPrometheusTest, common::util::WithMockAssert {}; |
269 | | - |
270 | | -TEST_F(WorkQueueDeathTest, ExecuteTaskAssertsWhenQueueIsEmpty) |
| 270 | +TEST_F(WorkQueueDeathTest, DISABLED_ExecuteTaskAssertsWhenQueueIsEmpty) |
271 | 271 | { |
272 | 272 | [[maybe_unused]] auto& queuedMock = makeMock<CounterInt>("work_queue_queued_total_number", ""); |
273 | 273 | [[maybe_unused]] auto& durationMock = makeMock<CounterInt>("work_queue_cumulative_tasks_duration_us", ""); |
|
0 commit comments