diff options
Diffstat (limited to 'src/mongo/shell/replsettest.js')
| -rw-r--r-- | src/mongo/shell/replsettest.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js index 1ca47130df7..a9c8c36b050 100644 --- a/src/mongo/shell/replsettest.js +++ b/src/mongo/shell/replsettest.js @@ -380,7 +380,7 @@ ReplSetTest.awaitRSClientHosts = function( conn, host, hostOk, rs ) { } ReplSetTest.prototype.awaitSecondaryNodes = function( timeout ) { - this.getMaster(); // Wait for a primary to be selected. + this.getMaster(timeout); // Wait for a primary to be selected. var tmo = timeout || 60000; var replTest = this; assert.soon( @@ -469,17 +469,17 @@ ReplSetTest.prototype.initiate = function( cfg , initCmd , timeout ) { var config = cfg || this.getReplSetConfig(); var cmd = {}; var cmdKey = initCmd || 'replSetInitiate'; - var timeout = timeout || 30000; + var tmo = timeout || 30000; cmd[cmdKey] = config; printjson(cmd); - jsTest.attempt({context:this, timeout: timeout, desc: "Initiate replica set"}, function() { + jsTest.attempt({context:this, timeout: tmo, desc: "Initiate replica set"}, function() { var result = master.runCommand(cmd); printjson(result); return result['ok'] == 1; }); - this.awaitSecondaryNodes(); + this.awaitSecondaryNodes(timeout); // Setup authentication if running test with authentication if (jsTestOptions().keyFile && !this.keyFile) { |