From bc470fa684619411b721d176f806ea8093a0c5f9 Mon Sep 17 00:00:00 2001 From: Mark Benvenuto Date: Thu, 2 Jul 2020 20:04:31 -0400 Subject: SERVER-49035 Move watchdog death test to test suite --- src/mongo/watchdog/watchdog_test.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mongo/watchdog/watchdog_test.cpp b/src/mongo/watchdog/watchdog_test.cpp index c6993c268cd..9c954c812bc 100644 --- a/src/mongo/watchdog/watchdog_test.cpp +++ b/src/mongo/watchdog/watchdog_test.cpp @@ -394,7 +394,7 @@ TEST_F(WatchdogMonitorTest, SleepyHungCheck) { } // Positive: Make sure watchdog monitor terminates the process if a check is unresponsive -DEATH_TEST(WatchdogMonitorTest, Death, "") { +DEATH_TEST_F(WatchdogMonitorTest, Death, "") { auto sleepyCheck = std::make_unique(); std::vector> checks; @@ -405,7 +405,8 @@ DEATH_TEST(WatchdogMonitorTest, Death, "") { monitor.start(); - sleepmillis(1000); + // In TSAN builds, we need to wait enough time for death to be triggered + sleepsecs(100); } // Positive: Make sure the monitor can be paused and resumed, and it does not trigger death -- cgit v1.2.1