SERVER-37231 add test for $out and maxTimeMS

1 files changed, 7 insertions, 6 deletions

diff --git a/src/mongo/db/curop_failpoint_helpers.cpp b/src/mongo/db/curop_failpoint_helpers.cpp
index 635e1c66796..cc1c6027985 100644
--- a/src/mongo/db/curop_failpoint_helpers.cpp
+++ b/src/mongo/db/curop_failpoint_helpers.cpp
@@ -45,17 +45,18 @@ std::string CurOpFailpointHelpers::updateCurOpMsg(OperationContext* opCtx,
     return oldMsg;
 }
 
-void CurOpFailpointHelpers::waitWhileFailPointEnabled(
-    FailPoint* failPoint,
-    OperationContext* opCtx,
-    const std::string& curOpMsg,
-    const std::function<void(void)>& whileWaiting) {
+void CurOpFailpointHelpers::waitWhileFailPointEnabled(FailPoint* failPoint,
+                                                      OperationContext* opCtx,
+                                                      const std::string& curOpMsg,
+                                                      const std::function<void(void)>& whileWaiting,
+                                                      bool checkForInterrupt) {
     invariant(failPoint);
     auto origCurOpMsg = updateCurOpMsg(opCtx, curOpMsg);
 
     MONGO_FAIL_POINT_BLOCK((*failPoint), options) {
         const BSONObj& data = options.getData();
-        const bool shouldCheckForInterrupt = data["shouldCheckForInterrupt"].booleanSafe();
+        const bool shouldCheckForInterrupt =
+            checkForInterrupt || data["shouldCheckForInterrupt"].booleanSafe();
         while (MONGO_FAIL_POINT((*failPoint))) {
             sleepFor(Milliseconds(10));
             if (whileWaiting) {