remove race condition from tags.js and multiVersion/replset_primary_updater[1-6].js

1 files changed, 9 insertions, 3 deletions

diff --git a/jstests/replsets/tags.js b/jstests/replsets/tags.js
index 589d9a86cd2..a4906506b44 100644
--- a/jstests/replsets/tags.js
+++ b/jstests/replsets/tags.js
@@ -53,9 +53,15 @@ catch(e) {
     myprint(e);
 }
 
-replTest.awaitReplication();
-
-myprint("primary should now be 2");
+assert.soon(function() {
+    try {
+        return nodes[2].getDB("admin").isMaster().ismaster;
+    } catch (x) {
+        return false;
+    }
+}, 'wait for 2 to be primary', 60000);
+
+myprint("primary is now 2");
 master = replTest.getMaster();
 config = master.getDB("local").system.replset.findOne();
 printjson(config);