diff options
| author | Dianna Hohensee <dianna.hohensee@10gen.com> | 2017-10-20 15:44:39 -0400 |
|---|---|---|
| committer | Dianna Hohensee <dianna.hohensee@10gen.com> | 2017-10-20 15:44:39 -0400 |
| commit | 8abd58df5ab9799bd5d3930d6e240928e266fad5 (patch) | |
| tree | 4c55986caa1c445433c23e775dc880e648438ab4 /buildscripts | |
| parent | 258691ffb9ee561c48e897e1df6a1bc10ae376d6 (diff) | |
| download | mongo-8abd58df5ab9799bd5d3930d6e240928e266fad5.tar.gz | |
Revert "SERVER-31615 add tag to queryoptimizer3.js so it doesn't run in sharded passthrough suites"
This reverts commit 258691ffb9ee561c48e897e1df6a1bc10ae376d6.
Diffstat (limited to 'buildscripts')
5 files changed, 5 insertions, 9 deletions
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml index 21648575d6f..627d1e9af6c 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml @@ -160,8 +160,6 @@ selector: - jstests/core/views/views_stats.js - jstests/core/orf.js #explain.executionStats is not CC - jstests/core/rename7.js - exclude_with_any_tags: - - assumes_against_mongod_not_mongos executor: config: diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml index a3eaa46d3fd..fa5596c6606 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml @@ -181,8 +181,6 @@ 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 - exclude_with_any_tags: - - assumes_against_mongod_not_mongos executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml index 03b04f5b050..a7c40ba8356 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml @@ -76,8 +76,9 @@ selector: - jstests/core/mr1.js - jstests/core/mr3.js - jstests/core/mr4.js + # TODO: SERVER-30052 + - jstests/core/queryoptimizer3.js exclude_with_any_tags: - - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop - assumes_no_implicit_index_creation diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml index 13d7efd7319..fd219e98359 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml @@ -48,8 +48,7 @@ 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. - exclude_with_any_tags: - - assumes_against_mongod_not_mongos + executor: config: diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml index 2059124e280..c91b20b482d 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml @@ -31,6 +31,7 @@ selector: - jstests/core/max_time_ms.js # sleep, SERVER-2212. - jstests/core/notablescan.js # notablescan. - jstests/core/profile*.js # profiling. + - jstests/core/queryoptimizer3.js # SERVER-31557 - jstests/core/repair_database.js # repairDatabase - jstests/core/repair_database_input_validation.js # repairDatabase - jstests/core/repair_server12955.js # repairDatabase @@ -48,8 +49,7 @@ 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. - exclude_with_any_tags: - - assumes_against_mongod_not_mongos + executor: config: |