SERVER-27052 fixed FetcherTest::ScheduleButShutdown test case - test should not assume when the task executor's shutdown() function will deliver the cancellation event to the fetcher's callback

1 files changed, 6 insertions, 8 deletions

diff --git a/src/mongo/client/fetcher_test.cpp b/src/mongo/client/fetcher_test.cpp
index 2e393dda3ef..00dae071d3a 100644
--- a/src/mongo/client/fetcher_test.cpp
+++ b/src/mongo/client/fetcher_test.cpp
@@ -365,19 +365,17 @@ TEST_F(FetcherTest, ScheduleButShutdown) {
     auto net = getNet();
     {
         executor::NetworkInterfaceMock::InNetworkGuard guard(net);
-        assertRemoteCommandNameEquals("find", net->scheduleSuccessfulResponse(BSON("ok" << 1)));
-        // Network interface should not deliver mock response to callback
-        // until runReadyNetworkOperations() is called.
+        auto noi = net->getNextReadyRequest();
+        assertRemoteCommandNameEquals("find", noi->getRequest());
+        net->blackHole(noi);
     }
 
     ASSERT_TRUE(fetcher->isActive());
-    getExecutor().shutdown();
     ASSERT_EQUALS(Fetcher::State::kRunning, fetcher->getState_forTest());
 
-    {
-        executor::NetworkInterfaceMock::InNetworkGuard guard(net);
-        net->runReadyNetworkOperations();
-    }
+    getExecutor().shutdown();
+
+    fetcher->join();
     ASSERT_FALSE(fetcher->isActive());
 
     ASSERT_EQUALS(ErrorCodes::CallbackCanceled, status.code());