summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2020-07-02 20:04:31 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-07-03 00:31:10 +0000
commitbc470fa684619411b721d176f806ea8093a0c5f9 (patch)
tree7606fc92a02b44caa7dc3afca8e8912661201a35
parenteeda016f9579c9e880b7bc2a8d0d7e76501c88f2 (diff)
downloadmongo-bc470fa684619411b721d176f806ea8093a0c5f9.tar.gz
SERVER-49035 Move watchdog death test to test suite
-rw-r--r--src/mongo/watchdog/watchdog_test.cpp5
1 files 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<SleepyCheck>();
std::vector<std::unique_ptr<WatchdogCheck>> 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