diff options
Diffstat (limited to 'src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp')
-rw-r--r-- | src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp index 2c2919e830b..fd0c03f9d9a 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp @@ -629,16 +629,13 @@ TEST_F( NetworkInterfaceMock* net = getNet(); net->enterNetwork(); ReplSetHeartbeatResponse hbResp2; - ReplSetConfig config; - config - .initialize(BSON("_id" - << "mySet" - << "version" << 3 << "protocolVersion" << 1 << "members" - << BSON_ARRAY(BSON("_id" << 1 << "host" - << "node1:12345") - << BSON("_id" << 2 << "host" - << "node2:12345")))) - .transitional_ignore(); + auto config = ReplSetConfig::parse(BSON("_id" + << "mySet" + << "version" << 3 << "protocolVersion" << 1 << "members" + << BSON_ARRAY(BSON("_id" << 1 << "host" + << "node1:12345") + << BSON("_id" << 2 << "host" + << "node2:12345")))); hbResp2.setConfig(config); hbResp2.setConfigVersion(3); hbResp2.setSetName("mySet"); @@ -697,16 +694,13 @@ TEST_F(ReplCoordTest, NodeDoesNotAcceptHeartbeatReconfigWhileInTheMidstOfReconfi net->runUntil(net->now() + Seconds(10)); // run until we've sent a heartbeat request const NetworkInterfaceMock::NetworkOperationIterator noi = net->getNextReadyRequest(); ReplSetHeartbeatResponse hbResp; - ReplSetConfig config; - config - .initialize(BSON("_id" - << "mySet" - << "version" << 4 << "members" - << BSON_ARRAY(BSON("_id" << 1 << "host" - << "node1:12345") - << BSON("_id" << 2 << "host" - << "node2:12345")))) - .transitional_ignore(); + auto config = ReplSetConfig::parse(BSON("_id" + << "mySet" + << "version" << 4 << "members" + << BSON_ARRAY(BSON("_id" << 1 << "host" + << "node1:12345") + << BSON("_id" << 2 << "host" + << "node2:12345")))); hbResp.setConfig(config); hbResp.setConfigVersion(4); hbResp.setSetName("mySet"); @@ -2114,7 +2108,7 @@ TEST_F(ReplCoordTest, StepUpReconfigConcurrentWithHeartbeatReconfig) { startCapturingLogMessages(); OpTime lastApplied(Timestamp(100, 1), 0); ReplSetHeartbeatResponse hbResp; - ASSERT_OK(rsConfig.initialize(newerConfig)); + rsConfig = ReplSetConfig::parse(newerConfig); hbResp.setConfig(rsConfig); hbResp.setSetName(rsConfig.getReplSetName()); hbResp.setState(MemberState::RS_SECONDARY); @@ -2193,7 +2187,7 @@ TEST_F(ReplCoordTest, StepUpReconfigConcurrentWithForceHeartbeatReconfig) { OpTime lastApplied(Timestamp(100, 1), 0); ReplSetHeartbeatResponse hbResp; - ASSERT_OK(rsConfig.initialize(newerConfig)); + rsConfig = ReplSetConfig::parse(newerConfig); hbResp.setConfig(rsConfig); hbResp.setSetName(rsConfig.getReplSetName()); hbResp.setState(MemberState::RS_SECONDARY); |