diff options
author | matt dannenberg <matt.dannenberg@10gen.com> | 2016-01-04 05:21:45 -0500 |
---|---|---|
committer | matt dannenberg <matt.dannenberg@10gen.com> | 2016-01-11 04:24:06 -0500 |
commit | aacd231be0626a204cb40908afdf62c4b67bb0ad (patch) | |
tree | e8b572f0e5aa9bb6ee200b0346e75092c3b1b19d | |
parent | cc24abff024b63e9680a03990f14e3ca299263c1 (diff) | |
download | mongo-aacd231be0626a204cb40908afdf62c4b67bb0ad.tar.gz |
SERVER-22120 rework bad nested assert.soon()s in no_chaining.jsr3.3.0
-rw-r--r-- | jstests/replsets/no_chaining.js | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/jstests/replsets/no_chaining.js b/jstests/replsets/no_chaining.js index 97acc61875a..88bbe7a78d0 100644 --- a/jstests/replsets/no_chaining.js +++ b/jstests/replsets/no_chaining.js @@ -46,20 +46,19 @@ var checkNoChaining = function() { }; var forceSync = function() { + var config; + try { + config = nodes[2].getDB("local").system.replset.findOne(); + } catch (e) { + config = nodes[2].getDB("local").system.replset.findOne(); + } + var targetHost = config.members[1].host; + printjson(nodes[2].getDB("admin").runCommand({replSetSyncFrom : targetHost})); assert.soon( function() { - var config = nodes[2].getDB("local").system.replset.findOne(); - var targetHost = config.members[1].host; - printjson(nodes[2].getDB("admin").runCommand({replSetSyncFrom : targetHost})); - assert.soon( - function() { - return nodes[2].getDB("test").foo.findOne() != null; - }, - 'Check for data after force sync', 5000 - ); return nodes[2].getDB("test").foo.findOne() != null; }, - 'Check force sync still works' + 'Check for data after force sync' ); }; |