From a7554f321b11336e93de1a94a68dea684abe7cf9 Mon Sep 17 00:00:00 2001
From: Geert Bosch <geert@mongodb.com>
Date: Wed, 27 Feb 2019 14:34:52 -0500
Subject: SERVER-39871 Make catalog_raii_test more resistant to clock issues on
 Windows

---
 src/mongo/db/catalog_raii_test.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mongo/db/catalog_raii_test.cpp b/src/mongo/db/catalog_raii_test.cpp
index 594cb6d29d9..17f015a7cca 100644
--- a/src/mongo/db/catalog_raii_test.cpp
+++ b/src/mongo/db/catalog_raii_test.cpp
@@ -72,7 +72,9 @@ void failsWithLockTimeout(stdx::function<void()> func, Milliseconds timeoutMilli
     } catch (const ExceptionFor<ErrorCodes::LockTimeout>& ex) {
         log() << ex;
         Date_t t2 = Date_t::now();
-        ASSERT_GTE(t2 - t1, timeoutMillis);
+        // Adding a "grace period" of 1 ms here to avoid infrequent test failures due to
+        // anomalies in the clock on old versions of Windows.
+        ASSERT_GTE(t2 - t1 + Milliseconds(1), timeoutMillis);
     }
 }
 
-- 
cgit v1.2.1