SERVER-21050 Cleanup ReplSetTest

This is just a cleanup work to hide some of the private state of
ReplSetTest so it is easier to encapsulate and add new logic. Also enables
strict mode.

4 files changed, 5 insertions, 5 deletions

diff --git a/jstests/tool/dumprestore10.js b/jstests/tool/dumprestore10.js
index 858032827a7..6cf3cbbbfa1 100644
--- a/jstests/tool/dumprestore10.js
+++ b/jstests/tool/dumprestore10.js
@@ -13,7 +13,7 @@ step();
 var replTest = new ReplSetTest( {name: name, nodes: 2} );
 var nodes = replTest.startSet();
 replTest.initiate();
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 var total = 1000;
 
 {
diff --git a/jstests/tool/dumprestore7.js b/jstests/tool/dumprestore7.js
index 04414bf85a8..9a7d09665ef 100644
--- a/jstests/tool/dumprestore7.js
+++ b/jstests/tool/dumprestore7.js
@@ -11,7 +11,7 @@ step();
 var replTest = new ReplSetTest( {name: name, nodes: 1} );
 var nodes = replTest.startSet();
 replTest.initiate();
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 
 {
     step("first chunk of data");
@@ -24,7 +24,7 @@ var master = replTest.getMaster();
 {
     step("wait");
     replTest.awaitReplication();
-    var time = replTest.getMaster().getDB("local").getCollection("oplog.rs").find().limit(1).sort({$natural:-1}).next();
+    var time = replTest.getPrimary().getDB("local").getCollection("oplog.rs").find().limit(1).sort({$natural:-1}).next();
     step(time.ts.t);
 }
 
diff --git a/jstests/tool/dumpsecondary.js b/jstests/tool/dumpsecondary.js
index 00f166dcf4c..7a641542498 100644
--- a/jstests/tool/dumpsecondary.js
+++ b/jstests/tool/dumpsecondary.js
@@ -3,7 +3,7 @@ var replTest = new ReplSetTest( {name: 'testSet', nodes: 2} );
 var nodes = replTest.startSet();
 replTest.initiate();
 
-var master = replTest.getMaster();
+var master = replTest.getPrimary();
 db = master.getDB("foo")
 db.foo.save({a: 1000});
 replTest.awaitReplication();
diff --git a/jstests/tool/tool_replset.js b/jstests/tool/tool_replset.js
index b5e8059045d..af5c7981482 100644
--- a/jstests/tool/tool_replset.js
+++ b/jstests/tool/tool_replset.js
@@ -23,7 +23,7 @@
     config.members[0].priority = 3;
     config.members[1].priority = 0;
     replTest.initiate(config);
-    var master = replTest.getMaster();
+    var master = replTest.getPrimary();
     assert.eq(nodes[0], master, "incorrect master elected");
     for (var i = 0; i < 100; i++) {
         assert.writeOK(master.getDB("foo").bar.insert({ a: i }));