diff options
| -rw-r--r-- | src/mongo/db/repl/abstract_oplog_fetcher_test.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/repl/reporter_test.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/executor/network_interface_mock.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/executor/task_executor_test_common.cpp | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/mongo/db/repl/abstract_oplog_fetcher_test.cpp b/src/mongo/db/repl/abstract_oplog_fetcher_test.cpp index 62cd3901f74..ebd840e36cf 100644 --- a/src/mongo/db/repl/abstract_oplog_fetcher_test.cpp +++ b/src/mongo/db/repl/abstract_oplog_fetcher_test.cpp @@ -462,7 +462,7 @@ TEST_F(AbstractOplogFetcherTest, OplogFetcherTimesOutCorrectlyOnInitialFindReque oplogFetcher.join(); // The fetcher should have shut down after its last request timed out. - ASSERT_EQUALS(ErrorCodes::NetworkTimeout, shutdownState->getStatus()); + ASSERT_TRUE(ErrorCodes::isExceededTimeLimitError(shutdownState->getStatus().code())); } TEST_F(AbstractOplogFetcherTest, OplogFetcherTimesOutCorrectlyOnRetriedFindRequests) { @@ -512,7 +512,7 @@ TEST_F(AbstractOplogFetcherTest, OplogFetcherTimesOutCorrectlyOnRetriedFindReque oplogFetcher.join(); // The fetcher should have shut down after its last request timed out. - ASSERT_EQUALS(ErrorCodes::NetworkTimeout, shutdownState->getStatus()); + ASSERT_TRUE(ErrorCodes::isExceededTimeLimitError(shutdownState->getStatus().code())); } bool sharedCallbackStateDestroyed = false; diff --git a/src/mongo/db/repl/reporter_test.cpp b/src/mongo/db/repl/reporter_test.cpp index e5b7607390d..7ce5768cf62 100644 --- a/src/mongo/db/repl/reporter_test.cpp +++ b/src/mongo/db/repl/reporter_test.cpp @@ -344,7 +344,7 @@ TEST_F(ReporterTestNoTriggerAtSetUp, IsNotActiveAfterUpdatePositionTimeoutExpire // Reporter should have shut down. ASSERT_FALSE(testReporter.isWaitingToSendReport()); ASSERT_FALSE(testReporter.isActive()); - ASSERT_EQUALS(testReporter.getStatus_forTest().code(), ErrorCodes::NetworkTimeout); + ASSERT_TRUE(ErrorCodes::isExceededTimeLimitError(testReporter.getStatus_forTest().code())); } // If an error is returned, it should be recorded in the Reporter and not run again. diff --git a/src/mongo/executor/network_interface_mock.cpp b/src/mongo/executor/network_interface_mock.cpp index 242e81126f6..c7c5178761a 100644 --- a/src/mongo/executor/network_interface_mock.cpp +++ b/src/mongo/executor/network_interface_mock.cpp @@ -467,7 +467,8 @@ void NetworkInterfaceMock::_enqueueOperation_inlock( if (timeout != RemoteCommandRequest::kNoTimeout) { invariant(timeout >= Milliseconds(0)); - ResponseStatus rs(ErrorCodes::NetworkTimeout, "Network timeout", Milliseconds(0)); + ResponseStatus rs( + ErrorCodes::NetworkInterfaceExceededTimeLimit, "Network timeout", Milliseconds(0)); std::vector<NetworkOperationList*> queuesToCheck{&_unscheduled, &_blackHoled, &_scheduled}; _alarms.emplace(_now_inlock() + timeout, [ this, diff --git a/src/mongo/executor/task_executor_test_common.cpp b/src/mongo/executor/task_executor_test_common.cpp index 42373c2b47b..fde8775fa3d 100644 --- a/src/mongo/executor/task_executor_test_common.cpp +++ b/src/mongo/executor/task_executor_test_common.cpp @@ -487,7 +487,7 @@ COMMON_EXECUTOR_TEST(RemoteCommandWithTimeout) { ASSERT_EQUALS(startTime + Milliseconds(2), net->now()); net->exitNetwork(); executor.wait(cbHandle); - ASSERT_EQUALS(ErrorCodes::NetworkTimeout, status); + ASSERT_EQUALS(ErrorCodes::NetworkInterfaceExceededTimeLimit, status); } COMMON_EXECUTOR_TEST(CallbackHandleComparison) { |