Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mongo/client/sdam/server_description_test.cpp b/src/mongo/client/sdam/server_description_test.cpp
index 9ca83dd1c63..b4cbc940c28 100644
--- a/src/mongo/client/sdam/server_description_test.cpp
+++ b/src/mongo/client/sdam/server_description_test.cpp
@@ -241,7 +241,7 @@ protected:
     static inline const auto kBsonMissingOk = BSONObjBuilder().obj();
     static inline const auto kBsonMongos = okBuilder().append("msg", "isdbgrid").obj();
     static inline const auto kBsonRsPrimary =
-        okBuilder().append("isWritablePrimary", true).append("setName", "foo").obj();
+        okBuilder().append("ismaster", true).append("setName", "foo").obj();
     static inline const auto kBsonRsSecondary =
         okBuilder().append("secondary", true).append("setName", "foo").obj();
     static inline const auto kBsonRsArbiter =
@@ -289,7 +289,7 @@ protected:
         okBuilder().append("topologyVersion", TopologyVersion(OID::max(), 0).toBSON()).obj();
 };
 
-TEST_F(ServerDescriptionTestFixture, ShouldParseTypeAsUnknownForHelloError) {
+TEST_F(ServerDescriptionTestFixture, ShouldParseTypeAsUnknownForIsMasterError) {
     auto response = HelloOutcome(HostAndPort("foo:1234"), kTopologyVersion, "an error occurred");
     auto description = ServerDescription(clockSource, response);
     ASSERT_EQUALS(ServerType::kUnknown, description.getType());
@@ -316,7 +316,7 @@ TEST_F(ServerDescriptionTestFixture, ShouldParseTypeAsMongos) {
 }
 
 TEST_F(ServerDescriptionTestFixture, ShouldParseTypeAsRSPrimary) {
-    // "isWritablePrimary: true", "setName" in response
+    // "ismaster: true", "setName" in response
     auto response = HelloOutcome(HostAndPort("foo:1234"), kBsonRsPrimary, HelloRTT::min());
     auto description = ServerDescription(clockSource, response);
     ASSERT_EQUALS(ServerType::kRSPrimary, description.getType());