SERVER-21098 Clean up some sharding jstests to allow them to run under both CSRS and SCCC mode

1 files changed, 10 insertions, 0 deletions

diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index 360feaceee1..33cf7f87895 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -406,6 +406,16 @@ ReplSetTest.prototype.getMaster = function( timeout ) {
 
 ReplSetTest.prototype.getPrimary = ReplSetTest.prototype.getMaster
 
+ReplSetTest.prototype.awaitNoPrimary = function(msg, timeout) {
+    msg = msg || "Timed out waiting for there to be no primary in replset: " + this.name;
+    timeout = timeout || 30000;
+    var self = this;
+    assert.soon(function() {
+                    return self.callIsMaster() == false;
+                }, msg, timeout);
+
+}
+
 ReplSetTest.prototype.getSecondaries = function( timeout ){
     var master = this.getMaster( timeout )
     var secs = []