SERVER-20346 NetworkInterfaceMock::runUntil() returns now()

2 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/executor/network_interface_mock.cpp b/src/mongo/executor/network_interface_mock.cpp
index 686f0b0198e..d62b13d87ae 100644
--- a/src/mongo/executor/network_interface_mock.cpp
+++ b/src/mongo/executor/network_interface_mock.cpp
@@ -270,7 +270,7 @@ void NetworkInterfaceMock::requeueAt(NetworkOperationIterator noi, Date_t dontAs
     _unscheduled.splice(insertBefore, _processing, noi);
 }
 
-void NetworkInterfaceMock::runUntil(Date_t until) {
+Date_t NetworkInterfaceMock::runUntil(Date_t until) {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     invariant(_currentlyRunning == kNetworkThread);
     invariant(until > _now_inlock());
@@ -294,6 +294,7 @@ void NetworkInterfaceMock::runUntil(Date_t until) {
         _waitingToRunMask |= kExecutorThread;
     }
     _runReadyNetworkOperations_inlock(&lk);
+    return _now_inlock();
 }
 
 void NetworkInterfaceMock::runReadyNetworkOperations() {
diff --git a/src/mongo/executor/network_interface_mock.h b/src/mongo/executor/network_interface_mock.h
index 3b62bd1f09d..0b231295595 100644
--- a/src/mongo/executor/network_interface_mock.h
+++ b/src/mongo/executor/network_interface_mock.h
@@ -170,10 +170,11 @@ public:
 
     /**
      * Runs the simulator forward until now() == until or hasReadyRequests() is true.
+     * Returns now().
      *
      * Will not return until the executor thread is blocked in waitForWorkUntil or waitForWork.
      */
-    void runUntil(Date_t until);
+    Date_t runUntil(Date_t until);
 
     /**
      * Processes all ready, scheduled network operations.