From e4dfae870226f59ad882aef4c070fc23d031782b Mon Sep 17 00:00:00 2001 From: Jack Mulrow Date: Mon, 4 Feb 2019 10:24:54 -0500 Subject: SERVER-38435 Update assertion messages in txn broadcast writes fsm workloads --- .../random_moveChunk_broadcast_delete_transaction.js | 19 ++++++++++--------- .../random_moveChunk_broadcast_update_transaction.js | 5 +++-- 2 files changed, 13 insertions(+), 11 deletions(-) (limited to 'jstests/concurrency') diff --git a/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_delete_transaction.js b/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_delete_transaction.js index 941118fd0bf..c2f25915610 100644 --- a/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_delete_transaction.js +++ b/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_delete_transaction.js @@ -112,23 +112,24 @@ var $config = extendWorkload($config, function($config, $super) { */ $config.states.verifyDocuments = function verifyDocuments(db, collName, connCache) { const docs = db[collName].find({tid: this.tid}).toArray(); - assertWhenOwnColl.eq(this.expectedDocuments.length, - docs.length, - 'unexpected number of documents, docs: ' + tojson(docs)); + assertWhenOwnColl.eq(this.expectedDocuments.length, docs.length, () => { + return 'unexpected number of documents, docs: ' + tojson(docs) + ', expected docs: ' + + tojson(this.expectedDocuments); + }); // Verify only the documents we haven't tried to delete were found. const expectedDocIds = new Set(this.expectedDocuments.map(doc => doc._id)); docs.forEach(doc => { - assertWhenOwnColl(expectedDocIds.has(doc._id), - 'expected document to be deleted, doc: ' + tojson(doc)); + assertWhenOwnColl(expectedDocIds.has(doc._id), () => { + return 'expected document to be deleted, doc: ' + tojson(doc); + }); expectedDocIds.delete(doc._id); }); // All expected document ids should have been found in the collection. - assertWhenOwnColl.eq( - 0, - expectedDocIds.size, - 'did not find all expected documents, _ids not found: ' + tojson(expectedDocIds)); + assertWhenOwnColl.eq(0, expectedDocIds.size, () => { + return 'did not find all expected documents, _ids not found: ' + tojson(expectedDocIds); + }); }; /** diff --git a/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_update_transaction.js b/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_update_transaction.js index fc2757bd379..09f33544464 100644 --- a/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_update_transaction.js +++ b/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_update_transaction.js @@ -74,8 +74,9 @@ var $config = extendWorkload($config, function($config, $super) { const docs = db[collName].find({tid: this.tid}).toArray(); docs.forEach(doc => { const expectedCounter = this.expectedCounters[doc._id]; - assertWhenOwnColl.eq( - expectedCounter, doc.counter, 'unexpected counter value, doc: ' + tojson(doc)); + assertWhenOwnColl.eq(expectedCounter, doc.counter, () => { + return 'unexpected counter value, doc: ' + tojson(doc); + }); }); }; -- cgit v1.2.1