SERVER-41809 Undo collapse of integration tests in mongo/client

4 files changed, 18 insertions, 9 deletions

diff --git a/buildscripts/resmokeconfig/suites/integration_tests_replset.yml b/buildscripts/resmokeconfig/suites/integration_tests_replset.yml
index 44ef2b121e0..61c3b91b5a1 100644
--- a/buildscripts/resmokeconfig/suites/integration_tests_replset.yml
+++ b/buildscripts/resmokeconfig/suites/integration_tests_replset.yml
@@ -3,8 +3,7 @@ test_kind: cpp_integration_test
 selector:
   root: build/integration_tests.txt
   exclude_files:
-  - build/integration_tests/dbclient_connection_integration_test* # Needs connection to single host.
-  - build/integration_tests/task_executor_cursor_integration_test* # Needs connection to single host.
+  - build/integration_tests/client_dbclient_connection_integration_test* # Needs connection to single host.
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/integration_tests_sharded.yml b/buildscripts/resmokeconfig/suites/integration_tests_sharded.yml
index 11705443082..2479e8746e7 100644
--- a/buildscripts/resmokeconfig/suites/integration_tests_sharded.yml
+++ b/buildscripts/resmokeconfig/suites/integration_tests_sharded.yml
@@ -3,9 +3,7 @@ test_kind: cpp_integration_test
 selector:
   root: build/integration_tests.txt
   exclude_files:
-  - build/integration_tests/network_interface_asio_integration_test*
-  - build/integration_tests/dbclient_connection_integration_test* # Needs sleep command
-  - build/integration_tests/task_executor_cursor_integration_test* # Not needed
+  - build/integration_tests/client_dbclient_connection_integration_test* # Needs sleep command
 
 executor:
   archive:
diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript
index 262aef128dc..76bfc013a31 100644
--- a/src/mongo/client/SConscript
+++ b/src/mongo/client/SConscript
@@ -295,15 +295,29 @@ env.CppUnitTest(
     ],
 )
 
+# The following two tests cannot be combined because the second one
+# needs to be filtered out for the repl and sharding variants of the
+# integration tests.
 env.CppIntegrationTest(
-    target='client_integration_test',
+    target='client_connpool_integration_test',
     source=[
         'connpool_integration_test.cpp',
-        'dbclient_connection_integration_test.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/transport/transport_layer_egress_init',
+        '$BUILD_DIR/mongo/util/version_impl',
         'clientdriver_network',
+    ],
+)
+
+env.CppIntegrationTest(
+    target='client_dbclient_connection_integration_test',
+    source=[
+        'dbclient_connection_integration_test.cpp',
+    ],
+    LIBDEPS=[
         '$BUILD_DIR/mongo/transport/transport_layer_egress_init',
         '$BUILD_DIR/mongo/util/version_impl',
+        'clientdriver_network',
     ],
 )
diff --git a/src/mongo/client/dbclient_connection_integration_test.cpp b/src/mongo/client/dbclient_connection_integration_test.cpp
index aa50b979bcb..0635047dd33 100644
--- a/src/mongo/client/dbclient_connection_integration_test.cpp
+++ b/src/mongo/client/dbclient_connection_integration_test.cpp
@@ -83,7 +83,6 @@ public:
     }
 };
 
-#if 0
 TEST_F(DBClientConnectionFixture, shutdownWorksIfCalledFirst) {
     auto conn = makeConn();
 
@@ -108,7 +107,6 @@ TEST_F(DBClientConnectionFixture, shutdownWorksIfRunCommandInProgress) {
     ASSERT_THROWS(conn->runCommand("admin", sleepCmd, reply),
                   ExceptionForCat<ErrorCategory::NetworkError>);  // Currently HostUnreachable.
 }
-#endif  // 0
 
 }  // namespace
 }  // namespace mongo