From cbb49ce74204c4b6804bf5110cfb02013f0123e2 Mon Sep 17 00:00:00 2001 From: Mike Grundy Date: Thu, 28 Jan 2016 11:42:00 -0500 Subject: SERVER-21698 Add error-checking for isMaster() return values in jstests/libs/election_timing_test.js --- jstests/libs/election_timing_test.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/jstests/libs/election_timing_test.js b/jstests/libs/election_timing_test.js index 8ff4daf8bbb..518ff2881f1 100644 --- a/jstests/libs/election_timing_test.js +++ b/jstests/libs/election_timing_test.js @@ -102,7 +102,10 @@ ElectionTimingTest.prototype._runTimingTest = function() { secondary = this.rst.getSecondary(); jsTestLog("Starting test: " + this.name + " run: " + run + " cycle: " + cycle); - var oldElectionId = primary.getDB("admin").isMaster().electionId; + var isMasterResult = primary.getDB("admin").isMaster(); + assert.commandWorked(isMasterResult, "isMaster() failed"); + var oldElectionId = isMasterResult.electionId; + assert.neq(undefined, oldElectionId, "isMaster() failed to return a valid electionId"); // Time the new election. var stepDownTime = Date.now(); @@ -131,7 +134,11 @@ ElectionTimingTest.prototype._runTimingTest = function() { // Verify we had an election and we have a new primary. var newPrimary = this.rst.getPrimary(); - var newElectionId = newPrimary.getDB("admin").isMaster().electionId; + isMasterResult = newPrimary.getDB("admin").isMaster(); + assert.commandWorked(isMasterResult, "isMaster() failed"); + var newElectionId = isMasterResult.electionId; + assert.neq(undefined, newElectionId, "isMaster() failed to return a valid electionId"); + if (bsonWoCompare(oldElectionId, newElectionId) !== 0) { this.testErrors.push({testRun: run, cycle: cycle, -- cgit v1.2.1