diff options
| author | Arun Banala <arun.banala@mongodb.com> | 2019-06-06 14:50:27 +0100 |
|---|---|---|
| committer | Arun Banala <arun.banala@mongodb.com> | 2019-06-10 17:52:49 +0100 |
| commit | 681fde4b157d1b534ccc08db6bc5e4bebd812951 (patch) | |
| tree | 84c0623d269963f8043a28e5d5c4bc212c82231b /jstests/sharding/merge_from_stale_mongos.js | |
| parent | 12688726db90a4d3e93904caf4f26dbbad55ba80 (diff) | |
| download | mongo-681fde4b157d1b534ccc08db6bc5e4bebd812951.tar.gz | |
SERVER-40961 Extend translated $out tests to support all $merge modes
Diffstat (limited to 'jstests/sharding/merge_from_stale_mongos.js')
| -rw-r--r-- | jstests/sharding/merge_from_stale_mongos.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jstests/sharding/merge_from_stale_mongos.js b/jstests/sharding/merge_from_stale_mongos.js index df03207bde6..d91d92dcb62 100644 --- a/jstests/sharding/merge_from_stale_mongos.js +++ b/jstests/sharding/merge_from_stale_mongos.js @@ -3,8 +3,8 @@ (function() { "use strict"; - load("jstests/aggregation/extras/out_helpers.js"); // For withEachMergeMode. - load("jstests/aggregation/extras/utils.js"); // For assertErrorCode. + load("jstests/aggregation/extras/merge_helpers.js"); // For withEachMergeMode. + load("jstests/aggregation/extras/utils.js"); // For assertErrorCode. const st = new ShardingTest({ shards: 2, @@ -111,7 +111,7 @@ withEachMergeMode(({whenMatchedMode, whenNotMatchedMode}) => { // Skip the combination of merge modes which will fail depending on the contents of the // source and target collection, as this will cause the assertion below to trip. - if (whenMatchedMode == "fail" || whenNotMatchedMode == "fail") + if (whenNotMatchedMode == "fail") return; // For each mode, test the following scenarios: |