diff options
| author | Judah Schvimer <judah@mongodb.com> | 2017-03-06 16:02:10 -0500 |
|---|---|---|
| committer | Judah Schvimer <judah@mongodb.com> | 2017-03-06 16:02:10 -0500 |
| commit | 5b5cf72ed9e52d71ed9f41b2219080fe46f62a3a (patch) | |
| tree | 9fb58b23f66748b64369316c766a4fa693fd76e2 /src/mongo/db/repl/replication_coordinator_impl_heartbeat_test.cpp | |
| parent | 59681ee6603fc43f0f3209ec0f9c6a09476edfcc (diff) | |
| download | mongo-5b5cf72ed9e52d71ed9f41b2219080fe46f62a3a.tar.gz | |
SERVER-27995 make repl_set* naming convention consistent
Diffstat (limited to 'src/mongo/db/repl/replication_coordinator_impl_heartbeat_test.cpp')
| -rw-r--r-- | src/mongo/db/repl/replication_coordinator_impl_heartbeat_test.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mongo/db/repl/replication_coordinator_impl_heartbeat_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_heartbeat_test.cpp index 91697d5ad01..69c9b6541c6 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_heartbeat_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_heartbeat_test.cpp @@ -32,9 +32,9 @@ #include "mongo/db/jsobj.h" #include "mongo/db/operation_context_noop.h" +#include "mongo/db/repl/repl_set_config.h" #include "mongo/db/repl/repl_set_heartbeat_args.h" #include "mongo/db/repl/repl_set_heartbeat_response.h" -#include "mongo/db/repl/replica_set_config.h" #include "mongo/db/repl/replication_coordinator_external_state_mock.h" #include "mongo/db/repl/replication_coordinator_impl.h" #include "mongo/db/repl/replication_coordinator_test_fixture.h" @@ -55,7 +55,7 @@ class ReplCoordHBTest : public ReplCoordTest { protected: void assertStartSuccess(const BSONObj& configDoc, const HostAndPort& selfHost); void assertMemberState(MemberState expected, std::string msg = ""); - ReplSetHeartbeatResponse receiveHeartbeatFrom(const ReplicaSetConfig& rsConfig, + ReplSetHeartbeatResponse receiveHeartbeatFrom(const ReplSetConfig& rsConfig, int sourceId, const HostAndPort& source); }; @@ -70,7 +70,7 @@ void ReplCoordHBTest::assertMemberState(const MemberState expected, std::string << " but found " << actual.toString() << " - " << msg; } -ReplSetHeartbeatResponse ReplCoordHBTest::receiveHeartbeatFrom(const ReplicaSetConfig& rsConfig, +ReplSetHeartbeatResponse ReplCoordHBTest::receiveHeartbeatFrom(const ReplSetConfig& rsConfig, int sourceId, const HostAndPort& source) { ReplSetHeartbeatArgs hbArgs; @@ -88,17 +88,17 @@ ReplSetHeartbeatResponse ReplCoordHBTest::receiveHeartbeatFrom(const ReplicaSetC TEST_F(ReplCoordHBTest, NodeJoinsExistingReplSetWhenReceivingAConfigContainingTheNodeViaHeartbeat) { logger::globalLogDomain()->setMinimumLoggedSeverity(logger::LogSeverity::Debug(3)); - ReplicaSetConfig rsConfig = assertMakeRSConfigV0(BSON("_id" - << "mySet" - << "version" - << 3 - << "members" - << BSON_ARRAY(BSON("_id" << 1 << "host" - << "h1:1") - << BSON("_id" << 2 << "host" - << "h2:1") - << BSON("_id" << 3 << "host" - << "h3:1")))); + ReplSetConfig rsConfig = assertMakeRSConfigV0(BSON("_id" + << "mySet" + << "version" + << 3 + << "members" + << BSON_ARRAY(BSON("_id" << 1 << "host" + << "h1:1") + << BSON("_id" << 2 << "host" + << "h2:1") + << BSON("_id" << 3 << "host" + << "h3:1")))); init("mySet"); addSelf(HostAndPort("h2", 1)); const Date_t startDate = getNet()->now(); @@ -140,7 +140,7 @@ TEST_F(ReplCoordHBTest, NodeJoinsExistingReplSetWhenReceivingAConfigContainingTh assertMemberState(MemberState::RS_STARTUP2); OperationContextNoop txn; - ReplicaSetConfig storedConfig; + ReplSetConfig storedConfig; ASSERT_OK(storedConfig.initialize( unittest::assertGet(getExternalState()->loadLocalConfigDocument(&txn)))); ASSERT_OK(storedConfig.validate()); @@ -154,17 +154,17 @@ TEST_F(ReplCoordHBTest, // Tests that a node in RS_STARTUP will not transition to RS_REMOVED if it receives a // configuration that does not contain it. logger::globalLogDomain()->setMinimumLoggedSeverity(logger::LogSeverity::Debug(3)); - ReplicaSetConfig rsConfig = assertMakeRSConfigV0(BSON("_id" - << "mySet" - << "version" - << 3 - << "members" - << BSON_ARRAY(BSON("_id" << 1 << "host" - << "h1:1") - << BSON("_id" << 2 << "host" - << "h2:1") - << BSON("_id" << 3 << "host" - << "h3:1")))); + ReplSetConfig rsConfig = assertMakeRSConfigV0(BSON("_id" + << "mySet" + << "version" + << 3 + << "members" + << BSON_ARRAY(BSON("_id" << 1 << "host" + << "h1:1") + << BSON("_id" << 2 << "host" + << "h2:1") + << BSON("_id" << 3 << "host" + << "h3:1")))); init("mySet"); addSelf(HostAndPort("h4", 1)); const Date_t startDate = getNet()->now(); |