SERVER-42004 localhost JS tests should wait for an election to complete before shutting down

3 files changed, 12 insertions, 3 deletions

diff --git a/jstests/replsets/localhost1.js b/jstests/replsets/localhost1.js
index 62064adfb91..d44f9f6b2ba 100644
--- a/jstests/replsets/localhost1.js
+++ b/jstests/replsets/localhost1.js
@@ -4,10 +4,13 @@
     'use strict';
 
     // Select localhost when binding to localhost
-    const rt = new ReplSetTest({name: "rsLocal", nodes: 2});
+    const rt = new ReplSetTest({name: "rsLocal", nodes: 1});
     const primary = rt.startSet({bind_ip: "127.0.0.1"})[0];
     const db = primary.getDB('admin');
     const resp = assert.commandWorked(db.adminCommand({replSetInitiate: undefined}));
     assert(resp.me.startsWith('127.0.0.1'), tojson(resp.me) + " does not start with 127.0.0.1:");
+
+    // Wait for the primary to complete its election before shutting down the set.
+    assert.soon(() => db.runCommand({ismaster: 1}).ismaster);
     rt.stopSet();
 })();
diff --git a/jstests/replsets/localhost2.js b/jstests/replsets/localhost2.js
index ac4dd7e0a76..aa3655dd1a2 100644
--- a/jstests/replsets/localhost2.js
+++ b/jstests/replsets/localhost2.js
@@ -4,7 +4,7 @@
     'use strict';
 
     // Select localhost when binding to localhost
-    const rt = new ReplSetTest({name: "rsLocal", nodes: 2});
+    const rt = new ReplSetTest({name: "rsLocal", nodes: 1});
     const primary = rt.startSet({bind_ip: "0.0.0.0"})[0];
     const db = primary.getDB('admin');
     const resp = assert.commandWorked(db.adminCommand({replSetInitiate: undefined}));
@@ -13,5 +13,8 @@
     assert(!resp.me.startsWith('0.0.0.0:'), tojson(resp.me) + " should not start with 0.0.0.0:");
     assert(!resp.me.startsWith('localhost:'),
            tojson(resp.me) + " should not start with localhost:");
+
+    // Wait for the primary to complete its election before shutting down the set.
+    assert.soon(() => db.runCommand({ismaster: 1}).ismaster);
     rt.stopSet();
 })();
diff --git a/jstests/replsets/localhost3.js b/jstests/replsets/localhost3.js
index ed3238a9d04..4f46505aaa6 100644
--- a/jstests/replsets/localhost3.js
+++ b/jstests/replsets/localhost3.js
@@ -4,10 +4,13 @@
     'use strict';
 
     // Select localhost when binding to localhost
-    const rt = new ReplSetTest({name: "rsLocal", nodes: 2});
+    const rt = new ReplSetTest({name: "rsLocal", nodes: 1});
     const primary = rt.startSet({bind_ip: undefined})[0];
     const db = primary.getDB('admin');
     const resp = assert.commandWorked(db.adminCommand({replSetInitiate: undefined}));
     assert(resp.me.startsWith('localhost:'), tojson(resp.me) + " should start with localhost:");
+
+    // Wait for the primary to complete its election before shutting down the set.
+    assert.soon(() => db.runCommand({ismaster: 1}).ismaster);
     rt.stopSet();
 })();