summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2014-04-02 12:56:33 -0400
committerMatt Kangas <matt.kangas@mongodb.com>2014-04-09 18:40:07 -0400
commit6850ecf70c9da11732d92f81fb81b411804f8671 (patch)
tree5bba686c558fe7d57736daeb19f0242b3c2de733
parent423ebc231ab8234ac3b2c8d11ca3759b0e99d19f (diff)
downloadmongo-6850ecf70c9da11732d92f81fb81b411804f8671.tar.gz
SERVER-13203 replset2.js no longer swallows exceptions or assertions
(cherry picked from commit 42e199594d2a9221307317ee6a9ae83b19ef875a)
-rw-r--r--jstests/replsets/replset2.js19
1 files changed, 11 insertions, 8 deletions
diff --git a/jstests/replsets/replset2.js b/jstests/replsets/replset2.js
index b0302d1058f..da8979bb34c 100644
--- a/jstests/replsets/replset2.js
+++ b/jstests/replsets/replset2.js
@@ -103,14 +103,17 @@ doTest = function (signal) {
verifyReplication("slave 1", slaves[1].getDB(testDB).baz);
}
catch(e) {
- print("ERROR: " + e);
- print("Master oplog findOne:");
- printjson(master.getDB("local").oplog.rs.find().sort({"$natural": -1}).limit(1).next());
- print("Slave 0 oplog findOne:");
- printjson(slaves[0].getDB("local").oplog.rs.find().sort({"$natural": -1}).limit(1).next());
- print("Slave 1 oplog findOne:");
- printjson(slaves[1].getDB("local").oplog.rs.find().sort({"$natural": -1}).limit(1).next());
- // TODO: SERVER-13203
+ var errstr = "ERROR: " + e;
+ errstr += "\nMaster oplog findOne:\n";
+ errstr += tojson(
+ master.getDB("local").oplog.rs.find().sort({"$natural":-1}).limit(1).next());
+ errstr += "\nSlave 0 oplog findOne:\n";
+ errstr += tojson(
+ slaves[0].getDB("local").oplog.rs.find().sort({"$natural":-1}).limit(1).next());
+ errstr += "\nSlave 1 oplog findOne:\n";
+ errstr += tojson(
+ slaves[1].getDB("local").oplog.rs.find().sort({"$natural":-1}).limit(1).next());
+ assert(false, errstr);
}
replTest.stopSet(signal);