Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 19 insertions, 16 deletions

diff --git a/src/mongo/dbtests/mock_replica_set_test.cpp b/src/mongo/dbtests/mock_replica_set_test.cpp
index 3b87b3b20e5..e3461193747 100644
--- a/src/mongo/dbtests/mock_replica_set_test.cpp
+++ b/src/mongo/dbtests/mock_replica_set_test.cpp
@@ -71,7 +71,7 @@ TEST(MockReplicaSetTest, GetNode) {
     ASSERT(replSet.getNode("$n3:27017") == nullptr);
 }
 
-TEST(MockReplicaSetTest, HelloNode0) {
+TEST(MockReplicaSetTest, IsMasterNode0) {
     MockReplicaSet replSet("n", 3);
     set<string> expectedHosts;
     expectedHosts.insert("$n0:27017");
@@ -80,10 +80,11 @@ TEST(MockReplicaSetTest, HelloNode0) {
 
     BSONObj cmdResponse;
     MockRemoteDBServer* node = replSet.getNode("$n0:27017");
-    bool ok = MockDBClientConnection(node).runCommand("foo.bar", BSON("hello" << 1), cmdResponse);
+    bool ok =
+        MockDBClientConnection(node).runCommand("foo.bar", BSON("ismaster" << 1), cmdResponse);
     ASSERT(ok);
 
-    ASSERT(cmdResponse["isWritablePrimary"].trueValue());
+    ASSERT(cmdResponse["ismaster"].trueValue());
     ASSERT(!cmdResponse["secondary"].trueValue());
     ASSERT_EQUALS("$n0:27017", cmdResponse["me"].str());
     ASSERT_EQUALS("$n0:27017", cmdResponse["primary"].str());
@@ -98,7 +99,7 @@ TEST(MockReplicaSetTest, HelloNode0) {
     ASSERT(expectedHosts == hostList);
 }
 
-TEST(MockReplicaSetTest, HelloNode1) {
+TEST(MockReplicaSetTest, IsMasterNode1) {
     MockReplicaSet replSet("n", 3);
     set<string> expectedHosts;
     expectedHosts.insert("$n0:27017");
@@ -107,10 +108,11 @@ TEST(MockReplicaSetTest, HelloNode1) {
 
     BSONObj cmdResponse;
     MockRemoteDBServer* node = replSet.getNode("$n1:27017");
-    bool ok = MockDBClientConnection(node).runCommand("foo.bar", BSON("hello" << 1), cmdResponse);
+    bool ok =
+        MockDBClientConnection(node).runCommand("foo.bar", BSON("ismaster" << 1), cmdResponse);
     ASSERT(ok);
 
-    ASSERT(!cmdResponse["isWritablePrimary"].trueValue());
+    ASSERT(!cmdResponse["ismaster"].trueValue());
     ASSERT(cmdResponse["secondary"].trueValue());
     ASSERT_EQUALS("$n1:27017", cmdResponse["me"].str());
     ASSERT_EQUALS("$n0:27017", cmdResponse["primary"].str());
@@ -125,7 +127,7 @@ TEST(MockReplicaSetTest, HelloNode1) {
     ASSERT(expectedHosts == hostList);
 }
 
-TEST(MockReplicaSetTest, HelloNode2) {
+TEST(MockReplicaSetTest, IsMasterNode2) {
     MockReplicaSet replSet("n", 3);
     set<string> expectedHosts;
     expectedHosts.insert("$n0:27017");
@@ -134,10 +136,11 @@ TEST(MockReplicaSetTest, HelloNode2) {
 
     BSONObj cmdResponse;
     MockRemoteDBServer* node = replSet.getNode("$n2:27017");
-    bool ok = MockDBClientConnection(node).runCommand("foo.bar", BSON("hello" << 1), cmdResponse);
+    bool ok =
+        MockDBClientConnection(node).runCommand("foo.bar", BSON("ismaster" << 1), cmdResponse);
     ASSERT(ok);
 
-    ASSERT(!cmdResponse["isWritablePrimary"].trueValue());
+    ASSERT(!cmdResponse["ismaster"].trueValue());
     ASSERT(cmdResponse["secondary"].trueValue());
     ASSERT_EQUALS("$n2:27017", cmdResponse["me"].str());
     ASSERT_EQUALS("$n0:27017", cmdResponse["primary"].str());
@@ -287,7 +290,7 @@ ReplSetConfig _getConfigWithMemberRemoved(const ReplSetConfig& oldConfig,
 }
 }  // namespace
 
-TEST(MockReplicaSetTest, HelloReconfigNodeRemoved) {
+TEST(MockReplicaSetTest, IsMasterReconfigNodeRemoved) {
     MockReplicaSet replSet("n", 3);
 
     ReplSetConfig oldConfig = replSet.getReplConfig();
@@ -296,14 +299,14 @@ TEST(MockReplicaSetTest, HelloReconfigNodeRemoved) {
     replSet.setConfig(newConfig);
 
     {
-        // Check that node is still a writable primary.
+        // Check isMaster for node still in set
         BSONObj cmdResponse;
         MockRemoteDBServer* node = replSet.getNode("$n0:27017");
         bool ok =
-            MockDBClientConnection(node).runCommand("foo.bar", BSON("hello" << 1), cmdResponse);
+            MockDBClientConnection(node).runCommand("foo.bar", BSON("ismaster" << 1), cmdResponse);
         ASSERT(ok);
 
-        ASSERT(cmdResponse["isWritablePrimary"].trueValue());
+        ASSERT(cmdResponse["ismaster"].trueValue());
         ASSERT(!cmdResponse["secondary"].trueValue());
         ASSERT_EQUALS("$n0:27017", cmdResponse["me"].str());
         ASSERT_EQUALS("$n0:27017", cmdResponse["primary"].str());
@@ -324,14 +327,14 @@ TEST(MockReplicaSetTest, HelloReconfigNodeRemoved) {
     }
 
     {
-        // Check node is no longer a writable primary.
+        // Check isMaster for node still not in set anymore
         BSONObj cmdResponse;
         MockRemoteDBServer* node = replSet.getNode(hostToRemove);
         bool ok =
-            MockDBClientConnection(node).runCommand("foo.bar", BSON("hello" << 1), cmdResponse);
+            MockDBClientConnection(node).runCommand("foo.bar", BSON("ismaster" << 1), cmdResponse);
         ASSERT(ok);
 
-        ASSERT(!cmdResponse["isWritablePrimary"].trueValue());
+        ASSERT(!cmdResponse["ismaster"].trueValue());
         ASSERT(!cmdResponse["secondary"].trueValue());
         ASSERT_EQUALS(hostToRemove, cmdResponse["me"].str());
         ASSERT_EQUALS("n", cmdResponse["setName"].str());