SERVER-35053 Remove injected read/write concern blacklists from causal consistency passthroughs

3 files changed, 16 insertions, 50 deletions

diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
index 573e6089fc3..67378ba9bde 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
@@ -6,6 +6,13 @@ selector:
   exclude_files:
   # In MongoDB 4.0, transactions are not supported in sharded clusters.
   - jstests/core/txns/**/*.js
+  # Cannot specify afterClusterTime and afterOpTime.
+  - jstests/core/read_after_optime.js
+  # Not expected to pass with replica-sets.
+  - jstests/core/opcounters_write_cmd.js
+  # Has conditional logic for standalone servers and replica sets, but can't distinguish the two
+  # when connected to mongos.
+  - jstests/core/write_result.js
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
   - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine
@@ -47,23 +54,6 @@ selector:
   # TODO: SERVER-27269: mongos can't establish cursor if view has $collStats and views another view.
   - jstests/core/views/views_coll_stats.js
   - jstests/core/killop_drop_collection.js # Uses fsyncLock.
-  # Tests that won't work with an injected 'majority' readConcern
-  # and/or an injected 'majority' writeConcern. Where a function is
-  # listed the reason is we don't have a reliable solution to override
-  # the write concern for that function.
-  - jstests/core/batch_write_command*.js # these tests use various write concerns
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/crud_api.js # has specific w:0 tests
-  - jstests/core/mr_merge.js # mr temp tables aren't replicated
-  - jstests/core/mr_merge2.js # mr temp tables aren't replicated
-  - jstests/core/mr_outreduce.js # mr temp tables aren't replicated
-  - jstests/core/mr_outreduce2.js # mr temp tables aren't replicated
-  - jstests/core/opcounters_active.js  # off by n problem with opcounters
-  - jstests/core/opcounters_write_cmd.js # off by n problem with opcounters
-  - jstests/core/read_after_optime.js # verifies read after optime fails on standalone
-  - jstests/core/shell1.js # tests setSlaveOk() variations on standalone mongod
-  - jstests/core/shell_writeconcern.js # checks write concern shell helpers
-  - jstests/core/write_result.js # Tests invalid writeConcern, we shouldn't override.
   # Tests that need triaging & remediation | blacklist decision
   # Comments list possible problem point under review.
   - jstests/core/stages_delete.js # Uses stageDebug command for deletes.
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
index a79331a8ee9..469ef33e92a 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
@@ -20,6 +20,13 @@ selector:
   # Skip any tests that require privileges for non test databases.
   - jstests/core/copydb.js
   - jstests/core/system_profile.js
+  # Cannot specify afterClusterTime and afterOpTime.
+  - jstests/core/read_after_optime.js
+  # Not expected to pass with replica-sets.
+  - jstests/core/opcounters_write_cmd.js
+  # Has conditional logic for standalone servers and replica sets, but can't distinguish the two
+  # when connected to mongos.
+  - jstests/core/write_result.js
   # The following tests fail because a certain command or functionality is not supported on
   # mongos. This command or functionality is placed in a comment next to the failing test.
   - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
@@ -61,23 +68,6 @@ selector:
   # TODO: SERVER-27269: mongos can't establish cursor if view has $collStats and views another view.
   - jstests/core/views/views_coll_stats.js
   - jstests/core/killop_drop_collection.js # Uses fsyncLock.
-  # Tests that won't work with an injected 'majority' readConcern
-  # and/or an injected 'majority' writeConcern. Where a function is
-  # listed the reason is we don't have a reliable solution to override
-  # the write concern for that function.
-  - jstests/core/batch_write_command*.js # these tests use various write concerns
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/crud_api.js # has specific w:0 tests
-  - jstests/core/mr_merge.js # mr temp tables aren't replicated
-  - jstests/core/mr_merge2.js # mr temp tables aren't replicated
-  - jstests/core/mr_outreduce.js # mr temp tables aren't replicated
-  - jstests/core/mr_outreduce2.js # mr temp tables aren't replicated
-  - jstests/core/opcounters_active.js  # off by n problem with opcounters
-  - jstests/core/opcounters_write_cmd.js # off by n problem with opcounters
-  - jstests/core/read_after_optime.js # verifies read after optime fails on standalone
-  - jstests/core/shell1.js # tests setSlaveOk() variations on standalone mongod
-  - jstests/core/shell_writeconcern.js # checks write concern shell helpers
-  - jstests/core/write_result.js # Tests invalid writeConcern, we shouldn't override.
   # Tests that need triaging & remediation | blacklist decision
   # Comments list possible problem point under review.
   - jstests/core/stages_delete.js # Uses stageDebug command for deletes.
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
index a3fab831fd6..78ccd3d0e26 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
@@ -8,6 +8,8 @@ selector:
   exclude_files:
   # In MongoDB 4.0, transactions are not supported in sharded clusters.
   - jstests/core/txns/**/*.js
+  # Not expected to pass with replica-sets.
+  - jstests/core/opcounters_write_cmd.js
   # The following tests fail because a certain command or functionality is not supported by
   # mongos. This command or functionality is placed in a comment next to the failing test.
   - jstests/core/apitest_db.js  # serverStatus output doesn't have storageEngine.
@@ -80,22 +82,6 @@ selector:
   - jstests/core/queryoptimizer3.js
   # TODO: SERVER-27269: mongos can't establish cursor if view has $collStats and views another view.
   - jstests/core/views/views_coll_stats.js
-  # Tests that won't work with an injected 'majority' readConcern
-  # and/or an injected 'majority' writeConcern. Where a function is
-  # listed the reason is we don't have a reliable solution to override
-  # the write concern for that function.
-  - jstests/core/batch_write_command*.js # these tests use various write concerns
-  - jstests/core/bench_test*.js # benchRun() used for writes
-  - jstests/core/crud_api.js # has specific w:0 tests
-  - jstests/core/mr_merge.js # mr temp tables aren't replicated
-  - jstests/core/mr_merge2.js # mr temp tables aren't replicated
-  - jstests/core/mr_outreduce.js # mr temp tables aren't replicated
-  - jstests/core/mr_outreduce2.js # mr temp tables aren't replicated
-  - jstests/core/opcounters_active.js  # off by n problem with opcounters
-  - jstests/core/opcounters_write_cmd.js # off by n problem with opcounters
-  - jstests/core/shell1.js # tests setSlaveOk() variations on standalone mongod
-  - jstests/core/shell_writeconcern.js # checks write concern shell helpers
-  - jstests/core/write_result.js # Tests invalid writeConcern, we shouldn't override.
   # Tests that need triaging & remediation | blacklist decision
   # Comments list possible problem point under review.
   - jstests/core/stages_delete.js # Uses stageDebug command for deletes.