remove test related to normalization of host names

2 files changed, 17 insertions, 14 deletions

diff --git a/src/mongo/client/sdam/server_description.cpp b/src/mongo/client/sdam/server_description.cpp
index 6276c02c316..62092a0de6c 100644
--- a/src/mongo/client/sdam/server_description.cpp
+++ b/src/mongo/client/sdam/server_description.cpp
@@ -435,8 +435,9 @@ ServerDescriptionPtr ServerDescription::cloneWithRTT(IsMasterRTT rtt) {
 
 const boost::optional<TopologyDescriptionPtr> ServerDescription::getTopologyDescription() {
     if (_topologyDescription) {
-        invariant(_topologyDescription.get());
-        boost::optional<TopologyDescriptionPtr>(_topologyDescription->lock());
+        const auto result = _topologyDescription->lock();
+        invariant(result);
+        return boost::optional<TopologyDescriptionPtr>(result);
     } else {
         return boost::none;
     }
diff --git a/src/mongo/client/sdam/topology_description_test.cpp b/src/mongo/client/sdam/topology_description_test.cpp
index 4ae91fe7edd..0d892e2f68a 100644
--- a/src/mongo/client/sdam/topology_description_test.cpp
+++ b/src/mongo/client/sdam/topology_description_test.cpp
@@ -84,18 +84,20 @@ TEST_F(TopologyDescriptionTestFixture, ShouldHaveCorrectDefaultValues) {
     assertDefaultConfig(TopologyDescription());
 }
 
-TEST_F(TopologyDescriptionTestFixture, ShouldNormalizeInitialSeedList) {
-    auto config = SdamConfiguration(kTwoServersVaryCase);
-    TopologyDescription topologyDescription(config);
-
-    auto expectedAddresses = kTwoServersNormalCase;
-
-    auto serverAddresses = map<ServerDescriptionPtr, ServerAddress>(
-        topologyDescription.getServers(),
-        [](const ServerDescriptionPtr& description) { return description->getAddress(); });
-
-    ASSERT_EQUALS(expectedAddresses, serverAddresses);
-}
+// Disable this test since this causes failures in jstests running on
+// hosts with mixed case hostnames.
+// TEST_F(TopologyDescriptionTestFixture, ShouldNormalizeInitialSeedList) {
+//    auto config = SdamConfiguration(kTwoServersVaryCase);
+//    TopologyDescription topologyDescription(config);
+//
+//    auto expectedAddresses = kTwoServersNormalCase;
+//
+//    auto serverAddresses = map<ServerDescriptionPtr, ServerAddress>(
+//        topologyDescription.getServers(),
+//        [](const ServerDescriptionPtr& description) { return description->getAddress(); });
+//
+//    ASSERT_EQUALS(expectedAddresses, serverAddresses);
+//}
 
 TEST_F(TopologyDescriptionTestFixture, ShouldAllowTypeSingleWithASingleSeed) {
     TopologyDescription topologyDescription(kSingleSeedConfig);