summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/replication_coordinator_test_fixture.h
diff options
context:
space:
mode:
authorJason Rassi <rassi@10gen.com>2015-09-24 11:16:32 -0400
committerJason Rassi <rassi@10gen.com>2015-09-24 11:16:32 -0400
commit19d2885ec51768ab73eee0c7239d8eadc0c51d8d (patch)
treec4cb48ef7e76746a1e6638debea4c0530724d9f1 /src/mongo/db/repl/replication_coordinator_test_fixture.h
parentb2a5ef9496ab5b26c8e51d92b4f3cdd0f2aba594 (diff)
downloadmongo-19d2885ec51768ab73eee0c7239d8eadc0c51d8d.tar.gz
Revert "SERVER-18498 New replica set configurations have protocolVersion=1 by default"
This reverts commit 2c1facf471cce8254e314755c3c7d2fbc753e5f4.
Diffstat (limited to 'src/mongo/db/repl/replication_coordinator_test_fixture.h')
-rw-r--r--src/mongo/db/repl/replication_coordinator_test_fixture.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/mongo/db/repl/replication_coordinator_test_fixture.h b/src/mongo/db/repl/replication_coordinator_test_fixture.h
index a4023857091..7d64c936fd0 100644
--- a/src/mongo/db/repl/replication_coordinator_test_fixture.h
+++ b/src/mongo/db/repl/replication_coordinator_test_fixture.h
@@ -67,24 +67,12 @@ public:
* Constructs a ReplicaSetConfig from the given BSON, or raises a test failure exception.
*/
static ReplicaSetConfig assertMakeRSConfig(const BSONObj& configBSON);
- static ReplicaSetConfig assertMakeRSConfigV0(const BSONObj& configBson);
-
- /**
- * Adds { protocolVersion: 0 or 1 } to the config.
- */
- static BSONObj addProtocolVersion(const BSONObj& configDoc, int protocolVersion);
protected:
virtual void setUp();
virtual void tearDown();
/**
- * Asserts that calling start(configDoc, selfHost) successfully initiates the
- * ReplicationCoordinator under test.
- */
- virtual void assertStartSuccess(const BSONObj& configDoc, const HostAndPort& selfHost);
-
- /**
* Gets the network mock.
*/
executor::NetworkInterfaceMock* getNet() {
@@ -196,6 +184,12 @@ protected:
void simulateSuccessfulV1Election();
/**
+ * Asserts that calling start(configDoc, selfHost) successfully initiates the
+ * ReplicationCoordinator under test.
+ */
+ void assertStartSuccess(const BSONObj& configDoc, const HostAndPort& selfHost);
+
+ /**
* Shuts down the objects under test.
*/
void shutdown();