minor: replset test cleanup

3 files changed, 14 insertions, 4 deletions

diff --git a/jstests/replsets/replset1.js b/jstests/replsets/replset1.js
index d3f0004535d..f4d9155f69b 100644
--- a/jstests/replsets/replset1.js
+++ b/jstests/replsets/replset1.js
@@ -47,7 +47,7 @@ doTest = function( signal ) {
     assert( master_id != new_master_id, "Old master shouldn't be equal to new master." );
 
     // Here's how to restart a node:
-    replTest.start( master_id, {}, true );
+    replTest.restart( master_id );
 
     // Shut down the set and finish the test.
     replTest.stopSet( signal );
diff --git a/jstests/replsets/replset3.js b/jstests/replsets/replset3.js
index 6330380a353..8126b9d35a0 100644
--- a/jstests/replsets/replset3.js
+++ b/jstests/replsets/replset3.js
@@ -36,10 +36,20 @@ doTest = function( signal ) {
     assert( master != new_master, "Old master shouldn't be equal to new master." );
 
     // Make sure that slaves are still up
-    var result = new_master.getDB("admin").runCommand({replSetGetStatus: true});
-
+    var result = new_master.getDB("admin").runCommand({replSetGetStatus: 1});
     assert( result['ok'] == 1, "Could not verify that slaves were still up:" + result );
 
+    slaves = replTest.liveNodes.slaves;
+    assert.soon(function() {
+        res = slaves[0].getDB("admin").runCommand({replSetGetStatus: 1})
+        return res.myState == 2;
+    }, "Slave 0 state not ready.");
+
+    assert.soon(function() {
+        res = slaves[1].getDB("admin").runCommand({replSetGetStatus: 1})
+        return res.myState == 2;
+    }, "Slave 1 state not ready.");
+
     replTest.stopSet( 15 );
 }
 
diff --git a/jstests/replsets/replset4.js b/jstests/replsets/replset4.js
index e5abc53d53f..4f6c45424b8 100644
--- a/jstests/replsets/replset4.js
+++ b/jstests/replsets/replset4.js
@@ -1,7 +1,7 @@
 doTest = function( signal ) {
 
     // Test orphaned master steps down
-    var replTest = new ReplSetTest( {name: 'testSet', nodes: 3, bridged: true} );
+    var replTest = new ReplSetTest( {name: 'testSet', nodes: 3} );
 
     replTest.startSet();
     replTest.initiate();