From 44834c0b99377a50837abb1e449f2cffc640aabf Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Thu, 25 Mar 2021 17:58:44 +0000 Subject: Make test less timing sensitive. --- .../disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp b/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp index efac3fdf804..666b4b50885 100644 --- a/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp +++ b/searchcore/src/tests/proton/server/disk_mem_usage_sampler/disk_mem_usage_sampler_test.cpp @@ -7,6 +7,9 @@ #include #include +#include +LOG_SETUP("disk_mem_usage_sampler_test"); + using namespace proton; using namespace std::chrono_literals; @@ -50,7 +53,15 @@ struct DiskMemUsageSamplerTest : public ::testing::Test { TEST_F(DiskMemUsageSamplerTest, resource_usage_is_sampled) { - std::this_thread::sleep_for(100ms); + // Poll for up to 20 seconds to get a sample. + size_t i = 0; + for (; i < (20s / 50ms); ++i) { + if (filter().get_transient_memory_usage() > 0) { + break; + } + std::this_thread::sleep_for(50ms); + } + LOG(info, "Polled %zu times (%zu ms) to get a sample", i, i * 50); EXPECT_GT(filter().getMemoryStats().getAnonymousRss(), 0); EXPECT_GT(filter().getDiskUsedSize(), 0); EXPECT_EQ(100, filter().get_transient_memory_usage()); -- cgit v1.2.3