New upstream version 3.4.14upstream/3.4.14

1 files changed, 13 insertions, 0 deletions

diff --git a/src/mongo/scripting/deadline_monitor_test.cpp b/src/mongo/scripting/deadline_monitor_test.cpp
index 71daefbce8f..d802673bd3d 100644
--- a/src/mongo/scripting/deadline_monitor_test.cpp
+++ b/src/mongo/scripting/deadline_monitor_test.cpp
@@ -73,8 +73,12 @@ public:
             _group->noteKill();
     }
     void interrupt() {}
+    const bool isKillPending() {
+        return killPending;
+    }
     TaskGroup* _group;
     uint64_t _killed;
+    bool killPending = false;
 };
 
 // single task expires before stopping the deadline
@@ -175,4 +179,13 @@ TEST(DeadlineMonitor, MultipleTasksExpireOrComplete) {
     }
 }
 
+TEST(DeadlineMonitor, IsKillPendingKills) {
+    DeadlineMonitor<Task> dm;
+    TaskGroup group;
+    Task task(&group);
+    dm.startDeadline(&task, -1);
+    task.killPending = true;
+    group.waitForKillCount(1);
+    ASSERT(task._killed);
+}
 }  // namespace mongo