SERVER-30866 Make op_msg_integration_test reconnect when clearing fail point

1 files changed, 9 insertions, 4 deletions

diff --git a/src/mongo/util/net/op_msg_integration_test.cpp b/src/mongo/util/net/op_msg_integration_test.cpp
index 3942c5dcf76..8da36c20902 100644
--- a/src/mongo/util/net/op_msg_integration_test.cpp
+++ b/src/mongo/util/net/op_msg_integration_test.cpp
@@ -139,14 +139,19 @@ TEST(OpMsg, CloseConnectionOnFireAndForgetNotMasterError) {
                                output))
             << output;
         ON_BLOCK_EXIT([&] {
-            ASSERT(conn.runCommand("admin",
-                                   fromjson(R"({
+            try {
+                uassertStatusOK(conn.connect(host, "integration_test-cleanup"));
+                ASSERT(conn.runCommand("admin",
+                                       fromjson(R"({
                                           configureFailPoint:
                                               'skipCheckingForNotMasterInCommandDispatch',
                                           mode: 'off'
                                       })"),
-                                   output))
-                << output;
+                                       output))
+                    << output;
+            } catch (...) {
+                std::terminate();
+            }
         });