diff options
| author | Spencer T Brody <spencer@mongodb.com> | 2020-08-25 14:39:34 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-30 18:36:03 +0000 |
| commit | 060d3119dba3cdefafb52bb005ba5e363cf723fb (patch) | |
| tree | 91be1c7694d62c553eb67446b9d621a0f30a8119 /buildscripts | |
| parent | 1e6b7e1bcaa39e49c47f533dfd31675be08223e4 (diff) | |
| download | mongo-060d3119dba3cdefafb52bb005ba5e363cf723fb.tar.gz | |
SERVER-46187 Unblacklist tests now that that sharded maxTimeMs works properly
This reverts commit 3e8fea7b03c7cb7fbed5e68714b0f3cfd663016c
Diffstat (limited to 'buildscripts')
4 files changed, 0 insertions, 12 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml index c9e196f37ca..4ed9f139ae1 100644 --- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml @@ -30,9 +30,6 @@ selector: # attached to statements in a transaction beyond the first one. - jstests/core/txns/non_transactional_operations_on_session_with_transaction.js - # TODO SERVER-46187: maxTimeMS doesn't work correctly for insert on mongos. - - jstests/core/txns/write_conflicts_with_non_txns.js - exclude_with_any_tags: - assumes_against_mongod_not_mongos - does_not_support_causal_consistency diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_causally_consistent_jscore_txns_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_causally_consistent_jscore_txns_passthrough.yml index b0ca2824900..3c5fb1caf01 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_causally_consistent_jscore_txns_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_causally_consistent_jscore_txns_passthrough.yml @@ -38,9 +38,6 @@ selector: - jstests/core/txns/create_indexes_parallel.js - jstests/core/txns/commands_in_txns_read_concern.js - # TODO SERVER-46187: maxTimeMS doesn't work correctly for insert on mongos. - - jstests/core/txns/write_conflicts_with_non_txns.js - exclude_with_any_tags: - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. diff --git a/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml b/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml index 2462d43b3a9..87ebb6eead4 100644 --- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml +++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml @@ -26,9 +26,6 @@ selector: # Uses hangAfterCollectionInserts failpoint not available on mongos. - jstests/core/txns/speculative_snapshot_includes_all_writes.js - # TODO SERVER-46187: maxTimeMS doesn't work correctly for insert on mongos. - - jstests/core/txns/write_conflicts_with_non_txns.js - exclude_with_any_tags: - assumes_against_mongod_not_mongos # Transactions are not allowed to operate on capped collections. diff --git a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml index b0cba47e0d8..a12c05bfee7 100644 --- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml +++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml @@ -34,9 +34,6 @@ selector: - jstests/core/txns/create_indexes_parallel.js - jstests/core/txns/commands_in_txns_read_concern.js - # TODO SERVER-46187: maxTimeMS doesn't work correctly for insert on mongos. - - jstests/core/txns/write_conflicts_with_non_txns.js - exclude_with_any_tags: - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. |