summaryrefslogtreecommitdiff
path: root/buildscripts/resmokeconfig
diff options
context:
space:
mode:
Diffstat (limited to 'buildscripts/resmokeconfig')
-rw-r--r--buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml5
-rw-r--r--buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml5
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml5
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml5
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml2
5 files changed, 22 insertions, 0 deletions
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
index d601ad0ca0c..4bf4048399d 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
@@ -142,6 +142,11 @@ selector:
- jstests/core/rename7.js
# getMore is not causally consistent if collection is dropped
- jstests/core/drop3.js
+ # The following tests fail because of divergent dropCollection behavior between standalones and
+ # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
+ # we expect a second drop to return status OK.
+ - jstests/core/drop.js
+ - jstests/core/explain_upsert.js
exclude_with_any_tags:
- assumes_against_mongod_not_mongos
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
index 2e122940b98..cc30f0303f0 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
@@ -163,6 +163,11 @@ selector:
- jstests/core/list_all_local_sessions.js # Too many users authenticated
- jstests/core/list_all_sessions.js # Too many users authenticated
- jstests/core/list_sessions.js # Too many users authenticated
+ # The following tests fail because of divergent dropCollection behavior between standalones and
+ # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
+ # we expect a second drop to return status OK.
+ - jstests/core/drop.js
+ - jstests/core/explain_upsert.js
exclude_with_any_tags:
- assumes_against_mongod_not_mongos
diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml
index 82d12497953..f9a9f9f5c9a 100644
--- a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml
@@ -49,6 +49,11 @@ 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.
+ # The following tests fail because of divergent dropCollection behavior between standalones and
+ # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
+ # we expect a second drop to return status OK.
+ - jstests/core/drop.js
+ - jstests/core/explain_upsert.js
exclude_with_any_tags:
- assumes_against_mongod_not_mongos
diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
index f1c8035cf0f..7daabd952f2 100644
--- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
@@ -49,6 +49,11 @@ 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.
+ # The following tests fail because of divergent dropCollection behavior between standalones and
+ # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
+ # we expect a second drop to return status OK.
+ - jstests/core/drop.js
+ - jstests/core/explain_upsert.js
exclude_with_any_tags:
- assumes_against_mongod_not_mongos
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
index f51681b7edf..8fd0c4098ad 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
@@ -23,6 +23,8 @@ selector:
- jstests/sharding/geo_near_random1.js
- jstests/sharding/geo_near_random2.js
- jstests/sharding/geo_near_sort.js
+ - jstests/sharding/basic_drop_coll.js
+ - jstests/sharding/commands_that_write_accept_wc_configRS.js
# Enable when 3.6 becomes last-stable.
- jstests/sharding/configsvr_metadata_commands_require_majority_write_concern.js
- jstests/sharding/views.js