summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorJonathan Abrahams <jonathan@mongodb.com>2015-12-08 13:19:54 -0500
committerJonathan Abrahams <jonathan@mongodb.com>2015-12-10 11:11:11 -0500
commit3e32d7c455b31a84c99bd2f95836cc4a14e9176a (patch)
tree568e2cd808d01150b958451ce5f59c40ad1c67a5 /buildscripts
parentb7e9ffa4eb7f790cff0813c7409a690bdb1b90f1 (diff)
downloadmongo-3e32d7c455b31a84c99bd2f95836cc4a14e9176a.tar.gz
SERVER-21450 - enableMajorityReadConcern in MongoRunner to unblacklist aggregation_read_concern_majority overrride
(cherry picked from commit 56cd81631ae7bf9c17761b937ac24286d323c63f)
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/aggregation_read_concern_majority_passthrough.yml14
1 files changed, 5 insertions, 9 deletions
diff --git a/buildscripts/resmokeconfig/suites/aggregation_read_concern_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/aggregation_read_concern_majority_passthrough.yml
index f2998641add..7b2eafec660 100644
--- a/buildscripts/resmokeconfig/suites/aggregation_read_concern_majority_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/aggregation_read_concern_majority_passthrough.yml
@@ -4,21 +4,17 @@ selector:
- jstests/aggregation/*.js
- jstests/aggregation/bugs/*.js
exclude_files:
- # mongod needs to start with the enableMajorityReadConcern flag. Tests that
- # start their own mongods will fail (ShardingTest, ReplSetTest, MongoRunner).
- - jstests/aggregation/bugs/server6118.js # Uses ShardingTest.
- - jstests/aggregation/bugs/server6179.js # Uses ShardingTest.
- - jstests/aggregation/bugs/server7781.js # Uses ShardingTest.
- jstests/aggregation/bugs/server18198.js # Uses a mocked mongo client to test read preference.
- - jstests/aggregation/bugs/server19095.js # Uses ShardingTest.
- - jstests/aggregation/mongos_slaveok.js # Uses ShardingTest.
- - jstests/aggregation/testshard1.js # Uses ShardingTest.
- - jstests/aggregation/testSlave.js # Starts ReplSetTest.
+ - jstests/aggregation/mongos_slaveok.js # Majority read on secondary requires afterOpTime.
+ - jstests/aggregation/testSlave.js # Majority read on secondary requires afterOpTime.
executor:
js_test:
config:
shell_options:
+ global_vars:
+ TestData:
+ enableMajorityReadConcern: ''
eval: "var testingReplication = true; load('jstests/libs/override_methods/set_majority_read_and_write_concerns.js');"
readMode: commands
hooks: