diff options
author | Ali Mir <ali.mir@mongodb.com> | 2020-04-23 16:15:22 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-29 17:32:39 +0000 |
commit | 98427b7a2228f6a8d54475adc9df3991c1c60314 (patch) | |
tree | ae15e1baebd19e41652b5c46bc8fa6ad61606b43 /jstests/core | |
parent | 18edfccc4083d80b8a289f2fec161c18b94be350 (diff) | |
download | mongo-98427b7a2228f6a8d54475adc9df3991c1c60314.tar.gz |
SERVER-46592 Remove all usages of the requires_fcv_44 tag from jstests
Diffstat (limited to 'jstests/core')
92 files changed, 192 insertions, 238 deletions
diff --git a/jstests/core/apitest_dbcollection.js b/jstests/core/apitest_dbcollection.js index 2c91c91877b..9bdbb8d0f91 100644 --- a/jstests/core/apitest_dbcollection.js +++ b/jstests/core/apitest_dbcollection.js @@ -3,10 +3,9 @@ * Tests for the db collection * * @tags: [ - * requires_fastcount, - * requires_collstats, - * requires_capped, - * requires_fcv_44, + * requires_capped, + * requires_collstats, + * requires_fastcount, * ] */ diff --git a/jstests/core/array_comparison_correctness.js b/jstests/core/array_comparison_correctness.js index 06509ecf1c7..5fb1e6bad0e 100644 --- a/jstests/core/array_comparison_correctness.js +++ b/jstests/core/array_comparison_correctness.js @@ -1,8 +1,7 @@ -/* +/** * Demonstrate the expected behavior of $lt and $gt comparisons involving arrays. This is only * tested without an index, results between index and non-index behavior are compared in * array_index_and_nonIndex_consistent.js - * @tags: [requires_fcv_44] */ (function() { diff --git a/jstests/core/array_index_and_nonIndex_consistent.js b/jstests/core/array_index_and_nonIndex_consistent.js index 9647bfa65d3..4e57b73286d 100644 --- a/jstests/core/array_index_and_nonIndex_consistent.js +++ b/jstests/core/array_index_and_nonIndex_consistent.js @@ -1,7 +1,6 @@ -/* +/** * Make sure that $gt and $lt queries return the same results regardless of whether there is a * multikey index. - * @tags: [requires_fcv_44] */ (function() { diff --git a/jstests/core/array_match4.js b/jstests/core/array_match4.js index dafbca8f4f9..821e9a4f4eb 100644 --- a/jstests/core/array_match4.js +++ b/jstests/core/array_match4.js @@ -1,4 +1,3 @@ -// @tags: [requires_fcv_44] var t = db.array_match4; t.drop(); diff --git a/jstests/core/background_validation.js b/jstests/core/background_validation.js index 3791f4d7dce..3de41bd8032 100644 --- a/jstests/core/background_validation.js +++ b/jstests/core/background_validation.js @@ -12,8 +12,6 @@ * does_not_support_stepdowns, * # Checkpoint cursors cannot be open in lsm. * does_not_support_wiredtiger_lsm, - * # Background validation will be first available in v4.4. - * requires_fcv_44, * # inMemory does not have checkpoints; background validation only runs on a checkpoint. * requires_persistence, * # Background validation is only supported by WT. diff --git a/jstests/core/bypass_doc_validation.js b/jstests/core/bypass_doc_validation.js index 45d877a0fad..2763747ea7f 100644 --- a/jstests/core/bypass_doc_validation.js +++ b/jstests/core/bypass_doc_validation.js @@ -2,9 +2,8 @@ // does_not_support_stepdowns, // requires_fastcount, // requires_non_retryable_commands, -// uses_map_reduce_with_temp_collections, -// requires_fcv_44, // uses_$out, +// uses_map_reduce_with_temp_collections, // ] /** diff --git a/jstests/core/check_shard_index.js b/jstests/core/check_shard_index.js index fbf77dfd47b..f187a6210d0 100644 --- a/jstests/core/check_shard_index.js +++ b/jstests/core/check_shard_index.js @@ -1,4 +1,8 @@ -// @tags: [requires_non_retryable_writes, requires_fastcount, requires_fcv_44, requires_sharding] +// @tags: [ +// requires_fastcount, +// requires_non_retryable_writes, +// requires_sharding, +// ] // ------------------------- // CHECKSHARDINGINDEX TEST UTILS diff --git a/jstests/core/collation.js b/jstests/core/collation.js index 73ee2229b87..e69fb01de22 100644 --- a/jstests/core/collation.js +++ b/jstests/core/collation.js @@ -1,14 +1,10 @@ // Cannot implicitly shard accessed collections because of collection existing when none // expected. -// Tagged with requires_fcv_44 due to change in the implementation of the returnKey query -// modifier, along with stricter rules for $-prefixed field name, which are not compatible -// with older versions. // @tags: [ // assumes_no_implicit_collection_creation_after_drop, // does_not_support_stepdowns, // requires_non_retryable_commands, // requires_non_retryable_writes, -// requires_fcv_44 // ] // Integration tests for the collation feature. diff --git a/jstests/core/collation_plan_cache.js b/jstests/core/collation_plan_cache.js index 909b9a48c56..50e6921c91b 100644 --- a/jstests/core/collation_plan_cache.js +++ b/jstests/core/collation_plan_cache.js @@ -1,15 +1,13 @@ // Integration testing for the plan cache and index filter commands with collation. // // @tags: [ +// assumes_read_concern_unchanged, // # This test attempts to perform queries and introspect the server's plan cache entries. The // # former operation may be routed to a secondary in the replica set, whereas the latter must be // # routed to the primary. // assumes_read_preference_unchanged, -// assumes_read_concern_unchanged, -// does_not_support_stepdowns, // assumes_unsharded_collection, -// # Sharding support for $planCacheStats requires all nodes to be binary version 4.4. -// requires_fcv_44, +// does_not_support_stepdowns, // ] (function() { 'use strict'; diff --git a/jstests/core/comment_field.js b/jstests/core/comment_field.js index 036c11a19c1..60345f10ad5 100644 --- a/jstests/core/comment_field.js +++ b/jstests/core/comment_field.js @@ -7,7 +7,6 @@ * assumes_unsharded_collection, * assumes_write_concern_unchanged, * does_not_support_stepdowns, - * requires_fcv_44, * requires_profiling, * uses_parallel_shell, * ] diff --git a/jstests/core/create_collection.js b/jstests/core/create_collection.js index 2c139708e2e..9e0a988299a 100644 --- a/jstests/core/create_collection.js +++ b/jstests/core/create_collection.js @@ -1,8 +1,11 @@ // Cannot implicitly shard accessed collections because of collection existing when none // expected. // FCV4.4 is required for creating a collection with a long name. -// @tags: [assumes_no_implicit_collection_creation_after_drop, requires_capped, -// assumes_against_mongod_not_mongos, requires_fcv_44] +// @tags: [ +// assumes_against_mongod_not_mongos, +// assumes_no_implicit_collection_creation_after_drop, +// requires_capped, +// ] // Tests for the "create" command. (function() { diff --git a/jstests/core/create_indexes.js b/jstests/core/create_indexes.js index 3e4b1e8d7ef..ae005388d8a 100644 --- a/jstests/core/create_indexes.js +++ b/jstests/core/create_indexes.js @@ -1,5 +1,7 @@ /** - * @tags: [assumes_superuser_permissions, requires_fcv_44] + * @tags: [ + * assumes_superuser_permissions, + * ] */ (function() { 'use strict'; diff --git a/jstests/core/crud_ops_do_not_throw_locktimeout.js b/jstests/core/crud_ops_do_not_throw_locktimeout.js index ceac45641cf..492374ab69a 100644 --- a/jstests/core/crud_ops_do_not_throw_locktimeout.js +++ b/jstests/core/crud_ops_do_not_throw_locktimeout.js @@ -5,8 +5,6 @@ * assumes_against_mongod_not_mongos, * assumes_read_concern_unchanged, * assumes_write_concern_unchanged, - * # This test requires failpoint behavior not available in v4.2. - * requires_fcv_44, * uses_parallel_shell, * ] */ diff --git a/jstests/core/dbref3.js b/jstests/core/dbref3.js index c98e22ea36b..6a91a56da2a 100644 --- a/jstests/core/dbref3.js +++ b/jstests/core/dbref3.js @@ -1,9 +1,6 @@ // Make sure we only make a DBRef object for objects where the first field is a string named $ref // and the second field is $id with any type. Only the first two fields matter for deciding if it // is a DBRef. See http://docs.mongodb.org/manual/reference/database-references/#dbrefs. -// -// It is not until mongod v4.4 that we support $-prefixed field names in $project stages. -// @tags: [requires_fcv_44] var t = db.dbref3; diff --git a/jstests/core/dbstats.js b/jstests/core/dbstats.js index c1ceb33b707..f3670c12552 100644 --- a/jstests/core/dbstats.js +++ b/jstests/core/dbstats.js @@ -1,6 +1,8 @@ // Confirms that the dbStats command returns expected content. // -// @tags: [requires_dbstats, requires_fcv_44] +// @tags: [ +// requires_dbstats, +// ] (function() { "use strict"; diff --git a/jstests/core/delete_hint.js b/jstests/core/delete_hint.js index 1eae8a1937c..ea9cb2751f7 100644 --- a/jstests/core/delete_hint.js +++ b/jstests/core/delete_hint.js @@ -4,7 +4,10 @@ * - The hint option should support both the name of the index, and the object spec of the * index. * - * @tags: [assumes_unsharded_collection, requires_non_retryable_writes, requires_fcv_44] + * @tags: [ + * assumes_unsharded_collection, + * requires_non_retryable_writes, + * ] */ (function() { diff --git a/jstests/core/distinct_array1.js b/jstests/core/distinct_array1.js index dc85ccafe8c..2d3a96a6af6 100644 --- a/jstests/core/distinct_array1.js +++ b/jstests/core/distinct_array1.js @@ -1,5 +1,3 @@ -// @tags: [requires_fcv_44] - t = db.distinct_array1; t.drop(); diff --git a/jstests/core/distinct_with_hashed_index.js b/jstests/core/distinct_with_hashed_index.js index d6c820ae2ab..0cd6afb5d2e 100644 --- a/jstests/core/distinct_with_hashed_index.js +++ b/jstests/core/distinct_with_hashed_index.js @@ -3,8 +3,10 @@ * of compound hashed indexes. In this test we also verify that the query planner uses * 'DISTINCT_SCAN' when it is appropriate. * - * The compound hashed indexes and the optimization to use 'DISTINCT_SCAN' were added in 4.4. - * @tags: [requires_fcv_44, assumes_unsharded_collection, does_not_support_stepdowns] + * @tags: [ + * assumes_unsharded_collection, + * does_not_support_stepdowns, + * ] */ (function() { "use strict"; diff --git a/jstests/core/doc_validation_invalid_validators.js b/jstests/core/doc_validation_invalid_validators.js index cce915c472a..b816100b0a2 100644 --- a/jstests/core/doc_validation_invalid_validators.js +++ b/jstests/core/doc_validation_invalid_validators.js @@ -1,7 +1,9 @@ // Cannot implicitly shard accessed collections because of collection existing when none // expected. -// @tags: [assumes_no_implicit_collection_creation_after_drop, requires_non_retryable_commands, -// requires_fcv_44] +// @tags: [ +// assumes_no_implicit_collection_creation_after_drop, +// requires_non_retryable_commands, +// ] // Verify invalid validator statements won't work and that we // can't create validated collections on restricted databases. diff --git a/jstests/core/elemMatchProjection.js b/jstests/core/elemMatchProjection.js index ccb8687d69f..69685f6f9e1 100644 --- a/jstests/core/elemMatchProjection.js +++ b/jstests/core/elemMatchProjection.js @@ -1,4 +1,6 @@ -// @tags: [requires_getmore, requires_fcv_44] +// @tags: [ +// requires_getmore, +// ] // Tests for $elemMatch projections and $ positional operator projection. (function() { "use strict"; diff --git a/jstests/core/explain_shell_helpers.js b/jstests/core/explain_shell_helpers.js index 9a2b1fed140..3045debb594 100644 --- a/jstests/core/explain_shell_helpers.js +++ b/jstests/core/explain_shell_helpers.js @@ -2,13 +2,11 @@ * Cannot implicitly shard accessed collections because the explain output from a mongod when run * against a sharded collection is wrapped in a "shards" object with keys for each shard. * - * @tags: [assumes_unsharded_collection, - * does_not_support_stepdowns, - * requires_fastcount, - * # Projection push down works differently between 4.2 and 4.4. explain() provides a - * # different output between the two versions. This test expects only the 4.4 version - * # output. - * requires_fcv_44] + * @tags: [ + * assumes_unsharded_collection, + * does_not_support_stepdowns, + * requires_fastcount, + * ] */ // Tests for the .explain() shell helper, which provides syntactic sugar for the explain command. diff --git a/jstests/core/explain_sort_type.js b/jstests/core/explain_sort_type.js index c5c772993f1..38165be32a2 100644 --- a/jstests/core/explain_sort_type.js +++ b/jstests/core/explain_sort_type.js @@ -3,14 +3,11 @@ * "default". * * @tags: [ - * # The distinction between the "simple" and "default" sort algorithms was introduced in version - * # should never run against a 4.2 node. - * requires_fcv_44, - * # Shard filtering may be required if the collection is sharded, which could affect the query - * # planner's selection of the "simple" versus "default" sort algorithm. - * assumes_unsharded_collection, - * # This test uses a non-retryable multi-update command. - * requires_non_retryable_writes, + * # Shard filtering may be required if the collection is sharded, which could affect the query + * # planner's selection of the "simple" versus "default" sort algorithm. + * assumes_unsharded_collection, + * # This test uses a non-retryable multi-update command. + * requires_non_retryable_writes, * ] */ (function() { diff --git a/jstests/core/failcommand_failpoint.js b/jstests/core/failcommand_failpoint.js index 92a270203b1..e76a72c2c19 100644 --- a/jstests/core/failcommand_failpoint.js +++ b/jstests/core/failcommand_failpoint.js @@ -1,5 +1,9 @@ -/* Tests the "failCommand" failpoint. - * @tags: [assumes_read_concern_unchanged, assumes_read_preference_unchanged, requires_fcv_44] +/** + * Tests the "failCommand" failpoint. + * @tags: [ + * assumes_read_concern_unchanged, + * assumes_read_preference_unchanged, + * ] */ (function() { "use strict"; diff --git a/jstests/core/find_and_modify.js b/jstests/core/find_and_modify.js index df698f17811..56eae294568 100644 --- a/jstests/core/find_and_modify.js +++ b/jstests/core/find_and_modify.js @@ -1,7 +1,10 @@ // Cannot implicitly shard accessed collections because of following errmsg: A single // update/delete on a sharded collection must contain an exact match on _id or contain the shard // key. -// @tags: [assumes_unsharded_collection, requires_fastcount, requires_fcv_44] +// @tags: [ +// assumes_unsharded_collection, +// requires_fastcount, +// ] t = db.find_and_modify; t.drop(); diff --git a/jstests/core/find_and_modify_hint.js b/jstests/core/find_and_modify_hint.js index c035f303ad0..57d0e9eca12 100644 --- a/jstests/core/find_and_modify_hint.js +++ b/jstests/core/find_and_modify_hint.js @@ -3,8 +3,11 @@ * - A bad argument to the hint option should raise an error. * - The hint option should support both the name of the index, and an index spec object. * - * @tags: [assumes_unsharded_collection, requires_non_retryable_writes, requires_find_command, - * requires_fcv_44] + * @tags: [ + * assumes_unsharded_collection, + * requires_find_command, + * requires_non_retryable_writes, + * ] */ (function() { diff --git a/jstests/core/find_and_modify_server6865.js b/jstests/core/find_and_modify_server6865.js index 196ddbe5074..1e154392ea9 100644 --- a/jstests/core/find_and_modify_server6865.js +++ b/jstests/core/find_and_modify_server6865.js @@ -1,7 +1,9 @@ // Cannot implicitly shard accessed collections because of following errmsg: A single // update/delete on a sharded collection must contain an exact match on _id or contain the shard // key. -// @tags: [assumes_unsharded_collection, requires_fcv_44] +// @tags: [ +// assumes_unsharded_collection, +// ] /** * Test that projection with a positional operator works with findAndModify diff --git a/jstests/core/find_projection_meta_errors.js b/jstests/core/find_projection_meta_errors.js index 9fb199247db..e6cf661255b 100644 --- a/jstests/core/find_projection_meta_errors.js +++ b/jstests/core/find_projection_meta_errors.js @@ -1,5 +1,4 @@ // Basic tests for errors when parsing the $meta projection. -// @tags: [requires_fcv_44] (function() { "use strict"; diff --git a/jstests/core/finda.js b/jstests/core/finda.js index 5399c69473c..50d04fb8b2c 100644 --- a/jstests/core/finda.js +++ b/jstests/core/finda.js @@ -1,4 +1,6 @@ -// @tags: [requires_getmore, requires_fcv_44] +// @tags: [ +// requires_getmore, +// ] // Tests where the QueryOptimizerCursor enters takeover mode during a query rather than a get more. diff --git a/jstests/core/fts_index_wildcard_and_weight.js b/jstests/core/fts_index_wildcard_and_weight.js index 9397be5cb9a..936d36c8a94 100644 --- a/jstests/core/fts_index_wildcard_and_weight.js +++ b/jstests/core/fts_index_wildcard_and_weight.js @@ -1,6 +1,5 @@ // Test that on a text index that matches all fields does not use a weight from a named field. // This test was designed to reproduce SERVER-45363. -// @tags: [requires_fcv_44] // (function() { "use strict"; diff --git a/jstests/core/fts_proj.js b/jstests/core/fts_proj.js index 2834b4d03eb..cc89f84442a 100644 --- a/jstests/core/fts_proj.js +++ b/jstests/core/fts_proj.js @@ -1,9 +1,5 @@ /** * Projection tests for FTS queries. - * - * Requires all nodes to be binary version 4.4, since this file includes test for additional - * validation of the query added in 4.4. - * @tags: [requires_fcv_44] */ (function() { "use strict"; diff --git a/jstests/core/fts_projection.js b/jstests/core/fts_projection.js index 5ef192203f2..3d08cb953f0 100644 --- a/jstests/core/fts_projection.js +++ b/jstests/core/fts_projection.js @@ -1,5 +1,4 @@ // Test $text with $textScore projection. -// @tags: [requires_fcv_44] (function() { "use strict"; diff --git a/jstests/core/fts_score_sort.js b/jstests/core/fts_score_sort.js index 2a45d441677..b9103ad0c6b 100644 --- a/jstests/core/fts_score_sort.js +++ b/jstests/core/fts_score_sort.js @@ -1,7 +1,4 @@ // Test sorting with text score metadata. -// -// Includes tests for changes to validation around "textScore" $meta that were introduced in 4.4. -// @tags: [requires_fcv_44] (function() { "use strict"; diff --git a/jstests/core/hashed_index_collation.js b/jstests/core/hashed_index_collation.js index 6b53002bdb7..f6c8382c3bc 100644 --- a/jstests/core/hashed_index_collation.js +++ b/jstests/core/hashed_index_collation.js @@ -3,7 +3,10 @@ * * The tags below are necessary because collation requires that we use read/write commands rather * than legacy operations. - * @tags: [requires_find_command, assumes_unsharded_collection, requires_fcv_44] + * @tags: [ + * assumes_unsharded_collection, + * requires_find_command, + * ] */ (function() { "use strict"; diff --git a/jstests/core/hashed_index_covered_queries.js b/jstests/core/hashed_index_covered_queries.js index 218359477e0..0f04e469785 100644 --- a/jstests/core/hashed_index_covered_queries.js +++ b/jstests/core/hashed_index_covered_queries.js @@ -2,7 +2,9 @@ * Test to verify that hashed indexes can cover projections when appropriate. The queries can be * covered when neither the query predicate nor projection uses a hashed field. * - * @tags: [assumes_unsharded_collection, requires_fcv_44] + * @tags: [ + * assumes_unsharded_collection, + * ] */ (function() { "use strict"; diff --git a/jstests/core/hashed_index_queries.js b/jstests/core/hashed_index_queries.js index 3174d2234d4..719959a2025 100644 --- a/jstests/core/hashed_index_queries.js +++ b/jstests/core/hashed_index_queries.js @@ -1,8 +1,6 @@ /** * Test to verify the behaviour of find, count, distinct operations in the presence of compound * hashed indexes. - * - * @tags: [requires_fcv_44] */ (function() { "use strict"; diff --git a/jstests/core/hashed_index_queries_with_logical_operators.js b/jstests/core/hashed_index_queries_with_logical_operators.js index 9249c54aaf1..7514e86aaa4 100644 --- a/jstests/core/hashed_index_queries_with_logical_operators.js +++ b/jstests/core/hashed_index_queries_with_logical_operators.js @@ -3,8 +3,6 @@ * like $or, $not etc. In particular, the hashed field of a compound hashed index cannot generate * bounds for $not predicates, since we may incorrectly filter out matching documents that collide * with the same hash value as the one given in the predicate. - * - * @tags: [requires_fcv_44] */ (function() { "use strict"; diff --git a/jstests/core/hashed_index_sort.js b/jstests/core/hashed_index_sort.js index 30a7048cff8..ce2c2802188 100644 --- a/jstests/core/hashed_index_sort.js +++ b/jstests/core/hashed_index_sort.js @@ -2,7 +2,9 @@ * Test to verify the behaviour of compound hashed indexes when 'sort' operation is used along with * the 'find' command. The test verifies compound hashed index with hashed prefix and non-hashed * prefix. - * @tags: [assumes_unsharded_collection, requires_fcv_44] + * @tags: [ + * assumes_unsharded_collection, + * ] */ (function() { "use strict"; diff --git a/jstests/core/hashed_index_with_arrays.js b/jstests/core/hashed_index_with_arrays.js index afbd241fd7d..8d6cc157eb6 100644 --- a/jstests/core/hashed_index_with_arrays.js +++ b/jstests/core/hashed_index_with_arrays.js @@ -1,7 +1,5 @@ /** * Test to verify the behaviour of compound hashed indexes. - * - * @tags: [requires_fcv_44] */ (function() { "use strict"; diff --git a/jstests/core/hashed_partial_and_sparse_index.js b/jstests/core/hashed_partial_and_sparse_index.js index d42ddfc8f86..cc6b5f30388 100644 --- a/jstests/core/hashed_partial_and_sparse_index.js +++ b/jstests/core/hashed_partial_and_sparse_index.js @@ -2,8 +2,6 @@ * Tests to verify that the queries return correct results in the presence of partial hashed * index and sparse index. The test verifies compound hashed index with hashed prefix and non-hashed * prefix. - * - * @tags: [requires_fcv_44] */ (function() { "use strict"; diff --git a/jstests/core/id_partial_projection.js b/jstests/core/id_partial_projection.js index d53c8c952fc..7735e710b98 100644 --- a/jstests/core/id_partial_projection.js +++ b/jstests/core/id_partial_projection.js @@ -1,7 +1,6 @@ /** * Tests partial inclusion/exclusion of _id. * See SERVER-7502 for details. - * @tags: [requires_fcv_44] */ (function() { "use strict"; diff --git a/jstests/core/idhack.js b/jstests/core/idhack.js index 0d4a1528f2a..a06e1fd287b 100644 --- a/jstests/core/idhack.js +++ b/jstests/core/idhack.js @@ -1,4 +1,7 @@ -// @tags: [requires_non_retryable_writes, assumes_balancer_off, requires_fcv_44] +// @tags: [ +// assumes_balancer_off, +// requires_non_retryable_writes, +// ] (function() { "use strict"; diff --git a/jstests/core/index_bounds_maxkey.js b/jstests/core/index_bounds_maxkey.js index 2786d841765..1b59340fffe 100644 --- a/jstests/core/index_bounds_maxkey.js +++ b/jstests/core/index_bounds_maxkey.js @@ -1,5 +1,8 @@ // Index bounds generation tests for MaxKey values. -// @tags: [requires_non_retryable_writes, assumes_unsharded_collection, requires_fcv_44] +// @tags: [ +// assumes_unsharded_collection, +// requires_non_retryable_writes, +// ] (function() { "use strict"; diff --git a/jstests/core/index_bounds_minkey.js b/jstests/core/index_bounds_minkey.js index 5dd6e19e2cb..78efd322b12 100644 --- a/jstests/core/index_bounds_minkey.js +++ b/jstests/core/index_bounds_minkey.js @@ -1,5 +1,8 @@ // Index bounds generation tests for MinKey values. -// @tags: [requires_non_retryable_writes, assumes_unsharded_collection, requires_fcv_44] +// @tags: [ +// assumes_unsharded_collection, +// requires_non_retryable_writes, +// ] (function() { "use strict"; diff --git a/jstests/core/index_diag.js b/jstests/core/index_diag.js index a3afa5002da..686a9e34b02 100644 --- a/jstests/core/index_diag.js +++ b/jstests/core/index_diag.js @@ -1,4 +1,6 @@ -// @tags: [assumes_balancer_off, requires_fcv_44] +// @tags: [ +// assumes_balancer_off, +// ] load("jstests/libs/fixture_helpers.js"); t = db.index_diag; diff --git a/jstests/core/index_filter_commands.js b/jstests/core/index_filter_commands.js index e3b4741ace8..9eb5e5f6688 100644 --- a/jstests/core/index_filter_commands.js +++ b/jstests/core/index_filter_commands.js @@ -30,8 +30,6 @@ * assumes_read_concern_unchanged, * does_not_support_stepdowns, * assumes_unsharded_collection, - * # Sharding support for $planCacheStats requires all nodes to be binary version 4.4. - * requires_fcv_44, * ] */ diff --git a/jstests/core/index_plugins.js b/jstests/core/index_plugins.js index 56681d9a642..3cd1c42f627 100644 --- a/jstests/core/index_plugins.js +++ b/jstests/core/index_plugins.js @@ -1,6 +1,4 @@ // Test creation of compound indexes with special index types. -// FCV4.4 is required for compound hashed indexes. -// @tags: [requires_fcv_44] (function() { "use strict"; const coll = db.index_plugins; diff --git a/jstests/core/internal_rename_if_options_and_indexes_match.js b/jstests/core/internal_rename_if_options_and_indexes_match.js index 527de754035..081da3691e6 100644 --- a/jstests/core/internal_rename_if_options_and_indexes_match.js +++ b/jstests/core/internal_rename_if_options_and_indexes_match.js @@ -2,10 +2,9 @@ // // This command cannot be run against mongos. // @tags: [ -// assumes_against_mongod_not_mongos, -// incompatible_with_embedded, -// requires_capped, -// requires_fcv_44, +// assumes_against_mongod_not_mongos, +// incompatible_with_embedded, +// requires_capped, // ] (function() { diff --git a/jstests/core/map_reduce_validation.js b/jstests/core/map_reduce_validation.js index 2bb25868729..953bc360626 100644 --- a/jstests/core/map_reduce_validation.js +++ b/jstests/core/map_reduce_validation.js @@ -1,9 +1,8 @@ // Tests that invalid options to the mapReduce command are rejected. // @tags: [ // assumes_no_implicit_collection_creation_after_drop, -// uses_map_reduce_with_temp_collections, // does_not_support_stepdowns, -// requires_fcv_44 +// uses_map_reduce_with_temp_collections, // ] (function() { "use strict"; diff --git a/jstests/core/mr_agg_explain.js b/jstests/core/mr_agg_explain.js index 2199ef7cfd5..e3d7a1be612 100644 --- a/jstests/core/mr_agg_explain.js +++ b/jstests/core/mr_agg_explain.js @@ -1,6 +1,8 @@ /** * Tests that running mapReduce with explain behaves as expected. - * @tags: [incompatible_with_embedded, requires_fcv_44] + * @tags: [ + * incompatible_with_embedded, + * ] */ (function() { "use strict"; diff --git a/jstests/core/mr_correctness.js b/jstests/core/mr_correctness.js index d26bc2cf5f3..9dc6aaf1c4c 100644 --- a/jstests/core/mr_correctness.js +++ b/jstests/core/mr_correctness.js @@ -6,9 +6,6 @@ // requires_fastcount, // requires_getmore, // uses_map_reduce_with_temp_collections, -// # Map Reduce before 4.4. does not support outputting to a sharded collection whose shard key is -// # {_id: "hashed"}. -// requires_fcv_44, // ] (function() { "use strict"; diff --git a/jstests/core/mr_fail_invalid_js.js b/jstests/core/mr_fail_invalid_js.js index 0bdef235bec..01b422c1fe3 100644 --- a/jstests/core/mr_fail_invalid_js.js +++ b/jstests/core/mr_fail_invalid_js.js @@ -1,12 +1,9 @@ // Tests that mapReduce fails gracefully when given a map or reduce function which fails in some // way. -// MapReduce uses $merge to merge in 4.4 which errors on missing fields, so this test cannot be run -// in multiversion. // @tags: [ // # mapReduce does not support afterClusterTime. // does_not_support_causal_consistency, // does_not_support_stepdowns, -// requires_fcv_44, // uses_map_reduce_with_temp_collections, // ] (function() { diff --git a/jstests/core/mr_null_arguments.js b/jstests/core/mr_null_arguments.js index fb51a8d580a..5cca8210656 100644 --- a/jstests/core/mr_null_arguments.js +++ b/jstests/core/mr_null_arguments.js @@ -6,7 +6,6 @@ // does_not_support_causal_consistency, // does_not_support_stepdowns, // uses_map_reduce_with_temp_collections, -// requires_fcv_44, // ] (function() { "use strict"; diff --git a/jstests/core/mr_reduce_merge_other_db.js b/jstests/core/mr_reduce_merge_other_db.js index 1bb8a4e3e0a..80edc601aa2 100644 --- a/jstests/core/mr_reduce_merge_other_db.js +++ b/jstests/core/mr_reduce_merge_other_db.js @@ -3,7 +3,6 @@ // does_not_support_causal_consistency, // does_not_support_stepdowns, // uses_map_reduce_with_temp_collections, -// requires_fcv_44, // ] (function() { "use strict"; diff --git a/jstests/core/mr_scope.js b/jstests/core/mr_scope.js index 75c8c52ed38..017d39b9268 100644 --- a/jstests/core/mr_scope.js +++ b/jstests/core/mr_scope.js @@ -4,9 +4,6 @@ // does_not_support_causal_consistency, // does_not_support_stepdowns, // uses_map_reduce_with_temp_collections, -// # Map Reduce before 4.4. does not support outputting to a sharded collection whose shard key is -// # {_id: "hashed"}. -// requires_fcv_44, // ] (function() { "use strict"; diff --git a/jstests/core/natural.js b/jstests/core/natural.js index 75ede89e648..6219515c0ef 100644 --- a/jstests/core/natural.js +++ b/jstests/core/natural.js @@ -1,7 +1,4 @@ // Tests for $natural sort and $natural hint. -// -// Includes tests for improved validation of $natural sort/hint added in 4.4. -// @tags: [requires_fcv_44] (function() { 'use strict'; diff --git a/jstests/core/notablescan.js b/jstests/core/notablescan.js index a384d0d8c2c..2bbc300238d 100644 --- a/jstests/core/notablescan.js +++ b/jstests/core/notablescan.js @@ -8,7 +8,6 @@ // assumes_read_preference_unchanged, // assumes_superuser_permissions, // does_not_support_stepdowns, -// requires_fcv_44, // ] t = db.test_notablescan; diff --git a/jstests/core/notablescan_capped.js b/jstests/core/notablescan_capped.js index 35646326a4a..c4b8fb3474e 100644 --- a/jstests/core/notablescan_capped.js +++ b/jstests/core/notablescan_capped.js @@ -9,7 +9,6 @@ // assumes_superuser_permissions, // does_not_support_stepdowns, // requires_capped, -// requires_fcv_44, // ] t = db.test_notablescan_capped; diff --git a/jstests/core/or4.js b/jstests/core/or4.js index efc0f941679..8cb5163544a 100644 --- a/jstests/core/or4.js +++ b/jstests/core/or4.js @@ -3,9 +3,6 @@ // requires_fastcount, // requires_getmore, // requires_non_retryable_writes, -// # Map Reduce before 4.4. does not support outputting to a sharded collection whose shard key is -// # {_id: "hashed"}. -// requires_fcv_44, // ] load("jstests/aggregation/extras/utils.js"); // For resultsEq diff --git a/jstests/core/plan_cache_clear.js b/jstests/core/plan_cache_clear.js index 934543fda6e..250e07be952 100644 --- a/jstests/core/plan_cache_clear.js +++ b/jstests/core/plan_cache_clear.js @@ -11,8 +11,6 @@ // does_not_support_stepdowns, // assumes_balancer_off, // assumes_unsharded_collection, -// # Sharding support for $planCacheStats requires all nodes to be binary version 4.4. -// requires_fcv_44, // ] (function() { diff --git a/jstests/core/plan_cache_list_plans.js b/jstests/core/plan_cache_list_plans.js index 9187ef13565..13c28cfb1a8 100644 --- a/jstests/core/plan_cache_list_plans.js +++ b/jstests/core/plan_cache_list_plans.js @@ -1,19 +1,17 @@ // Tests for using $planCacheStats to list cached plans. // // @tags: [ +// # If the balancer is on and chunks are moved, the plan cache can have entries with isActive: +// # false when the test assumes they are true because the query has already been run many times. +// assumes_balancer_off, +// assumes_read_concern_unchanged, // # This test attempts to perform queries and introspect the server's plan cache entries. The // # former operation may be routed to a secondary in the replica set, whereas the latter must be // # routed to the primary. // assumes_read_preference_unchanged, -// assumes_read_concern_unchanged, +// assumes_unsharded_collection, // does_not_support_stepdowns, -// # If the balancer is on and chunks are moved, the plan cache can have entries with isActive: -// # false when the test assumes they are true because the query has already been run many times. -// assumes_balancer_off, // inspects_whether_plan_cache_entry_is_active, -// assumes_unsharded_collection, -// # Sharding support for $planCacheStats requires all nodes to be binary version 4.4. -// requires_fcv_44, // ] (function() { diff --git a/jstests/core/plan_cache_list_shapes.js b/jstests/core/plan_cache_list_shapes.js index 90dbf9d8108..e682f34ecd1 100644 --- a/jstests/core/plan_cache_list_shapes.js +++ b/jstests/core/plan_cache_list_shapes.js @@ -11,8 +11,6 @@ // does_not_support_stepdowns, // assumes_balancer_off, // assumes_unsharded_collection, -// # Sharding support for $planCacheStats requires all nodes to be binary version 4.4. -// requires_fcv_44, // ] (function() { const coll = db.jstests_plan_cache_list_shapes; diff --git a/jstests/core/plan_cache_shell_helpers.js b/jstests/core/plan_cache_shell_helpers.js index a472a19ee8c..aba0d20047e 100644 --- a/jstests/core/plan_cache_shell_helpers.js +++ b/jstests/core/plan_cache_shell_helpers.js @@ -1,17 +1,15 @@ // Test the shell helpers which wrap the plan cache commands. // // @tags: [ +// assumes_balancer_off, +// assumes_read_concern_unchanged, // # This test attempts to perform queries and introspect the server's plan cache entries. The // # former operation may be routed to a secondary in the replica set, whereas the latter must be -// # routed to the primary. -// # If all chunks are moved off of a shard, it can cause the plan cache to miss commands. +// # routed to the primary. If all chunks are moved off of a shard, it can cause the plan cache to +// # miss commands. // assumes_read_preference_unchanged, -// assumes_read_concern_unchanged, -// does_not_support_stepdowns, -// assumes_balancer_off, // assumes_unsharded_collection, -// # Sharding support for $planCacheStats requires all nodes to be binary version 4.4. -// requires_fcv_44, +// does_not_support_stepdowns, // ] (function() { var coll = db.jstests_plan_cache_shell_helpers; diff --git a/jstests/core/plan_cache_stats_shard_and_host.js b/jstests/core/plan_cache_stats_shard_and_host.js index 500e2265cc8..573050ec41e 100644 --- a/jstests/core/plan_cache_stats_shard_and_host.js +++ b/jstests/core/plan_cache_stats_shard_and_host.js @@ -2,13 +2,10 @@ // for each plan cache entry when appropriate. // // @tags: [ -// assumes_read_preference_unchanged, +// assumes_balancer_off, // assumes_read_concern_unchanged, +// assumes_read_preference_unchanged, // does_not_support_stepdowns, -// assumes_balancer_off, -// # The "shard" and "host" fields were added in 4.4 as part of sharding support for -// # $planCacheStats. -// requires_fcv_44, // ] (function() { "use strict"; diff --git a/jstests/core/positional_projection_multiple_array_fields.js b/jstests/core/positional_projection_multiple_array_fields.js index 30a02bb5201..dbeba9fcced 100644 --- a/jstests/core/positional_projection_multiple_array_fields.js +++ b/jstests/core/positional_projection_multiple_array_fields.js @@ -1,10 +1,9 @@ -/* +/** * Test using the positional projection on documents which have multiple array fields. * See SERVER-6864 for details. * * Note that the user's query/filter document may only contain _ONE_ array field for positional * projection to work correctly. - * @tags: [requires_fcv_44] */ (function() { "use strict"; diff --git a/jstests/core/profile_mapreduce.js b/jstests/core/profile_mapreduce.js index feb9d417c1b..608971f8684 100644 --- a/jstests/core/profile_mapreduce.js +++ b/jstests/core/profile_mapreduce.js @@ -4,8 +4,6 @@ // does_not_support_stepdowns, // requires_profiling, // uses_map_reduce_with_temp_collections, -// TODO SERVER-47060 Unblacklist once FCV constants are updated for 4.6. -// requires_fcv_44, // ] // Confirms that profiled findAndModify execution contains all expected metrics with proper values. diff --git a/jstests/core/projection_conflicts.js b/jstests/core/projection_conflicts.js index 906a0d754c9..a77dcd9f843 100644 --- a/jstests/core/projection_conflicts.js +++ b/jstests/core/projection_conflicts.js @@ -1,6 +1,5 @@ /** * Test projections which have conflicts in them. - * @tags: [requires_fcv_44] */ (function() { "use strict"; diff --git a/jstests/core/projection_meta_index_key.js b/jstests/core/projection_meta_index_key.js index b245421496f..01f6d3c7876 100644 --- a/jstests/core/projection_meta_index_key.js +++ b/jstests/core/projection_meta_index_key.js @@ -1,9 +1,5 @@ // Test that indexKey $meta projection works in find and aggregate commands and produces correct // result depending on whether index key metadata is available or not. -// -// Support of indexKey $meta is a new feature in 4.4 which is not planned for back port, hence we -// need to blacklist it from multiversion testing. -// @tags: [requires_fcv_44] (function() { "use strict"; diff --git a/jstests/core/return_key.js b/jstests/core/return_key.js index bb91a810223..ef4d32497dd 100644 --- a/jstests/core/return_key.js +++ b/jstests/core/return_key.js @@ -1,7 +1,9 @@ // Cannot implicitly shard accessed collections because queries on a sharded collection are not // able to be covered when they aren't on the shard key since the document needs to be fetched in // order to apply the SHARDING_FILTER stage. -// @tags: [assumes_unsharded_collection, requires_fcv_44] +// @tags: [ +// assumes_unsharded_collection, +// ] /** * Tests for returnKey. diff --git a/jstests/core/rollback_index_drop.js b/jstests/core/rollback_index_drop.js index ffd7b1c62be..ac97d090f83 100644 --- a/jstests/core/rollback_index_drop.js +++ b/jstests/core/rollback_index_drop.js @@ -3,7 +3,10 @@ // // This test was designed to reproduce SERVER-38372. // -// @tags: [does_not_support_stepdowns, assumes_unsharded_collection, requires_fcv_44] +// @tags: [ +// assumes_unsharded_collection, +// does_not_support_stepdowns, +// ] (function() { "use strict"; diff --git a/jstests/core/sort_array.js b/jstests/core/sort_array.js index a5b4347d45d..fccfe744a71 100644 --- a/jstests/core/sort_array.js +++ b/jstests/core/sort_array.js @@ -1,4 +1,7 @@ -// @tags: [does_not_support_stepdowns, requires_non_retryable_writes, requires_fcv_44] +// @tags: [ +// does_not_support_stepdowns, +// requires_non_retryable_writes, +// ] /** * Tests for sorting documents by fields that contain arrays. diff --git a/jstests/core/sort_with_meta_operator.js b/jstests/core/sort_with_meta_operator.js index 195064dcb07..4208db3e212 100644 --- a/jstests/core/sort_with_meta_operator.js +++ b/jstests/core/sort_with_meta_operator.js @@ -1,7 +1,4 @@ // Tests to validate the input for sort on '$meta' operator. -// -// Require all nodes to be 4.4, since validation around $meta was relaxed in 4.4. -// @tags: [requires_fcv_44] (function() { "use strict"; const coll = db.sort_with_meta_operator; diff --git a/jstests/core/sortl.js b/jstests/core/sortl.js index 187130ffe58..23c2673b135 100644 --- a/jstests/core/sortl.js +++ b/jstests/core/sortl.js @@ -1,9 +1,5 @@ // Tests equality query on _id with a sort, intended to be tested on both mongos and mongod. For // SERVER-20641. -// -// Always run on a fully upgraded cluster, so that {$meta: "sortKey"} projections use the newest -// sort key format. -// @tags: [requires_fcv_44] (function() { 'use strict'; diff --git a/jstests/core/system_js_access.js b/jstests/core/system_js_access.js index 71690d33d14..2ca0e182a73 100644 --- a/jstests/core/system_js_access.js +++ b/jstests/core/system_js_access.js @@ -1,5 +1,8 @@ // Tests that JavaScript functions stored in system.js are loaded on a per-expression basis. -// @tags: [assumes_unsharded_collection, requires_non_retryable_writes, requires_fcv_44] +// @tags: [ +// assumes_unsharded_collection, +// requires_non_retryable_writes, +// ] (function() { "use strict"; diff --git a/jstests/core/txns/commands_in_txns_read_concern.js b/jstests/core/txns/commands_in_txns_read_concern.js index 0368fa05720..4e40092107d 100644 --- a/jstests/core/txns/commands_in_txns_read_concern.js +++ b/jstests/core/txns/commands_in_txns_read_concern.js @@ -1,12 +1,12 @@ -/* Ensures createCollection and createIndexes are not permitted to run with a readConcern other than +/** + * Ensures createCollection and createIndexes are not permitted to run with a readConcern other than * `local` inside transactions. * - * @tags: [uses_transactions, - * # Creating collections inside multi-document transactions is supported only in v4.4 - * # onwards. - * requires_fcv_44, - * assumes_no_implicit_collection_creation_after_drop, - * uses_snapshot_read_concern] + * @tags: [ + * assumes_no_implicit_collection_creation_after_drop, + * uses_snapshot_read_concern, + * uses_transactions, + * ] */ (function() { "use strict"; diff --git a/jstests/core/txns/concurrent_drops_and_creates.js b/jstests/core/txns/concurrent_drops_and_creates.js index 4fc9d930edc..a8685881152 100644 --- a/jstests/core/txns/concurrent_drops_and_creates.js +++ b/jstests/core/txns/concurrent_drops_and_creates.js @@ -4,9 +4,8 @@ * * @tags: [ * assumes_no_implicit_collection_creation_after_drop, - * uses_transactions, * uses_snapshot_read_concern, - * requires_fcv_44 + * uses_transactions, * ] */ (function() { diff --git a/jstests/core/txns/create_collection.js b/jstests/core/txns/create_collection.js index c861154e3ee..6870e1f5991 100644 --- a/jstests/core/txns/create_collection.js +++ b/jstests/core/txns/create_collection.js @@ -1,10 +1,10 @@ -/* Tests simple cases of creating a collection inside a multi-document transaction, both +/** + * Tests simple cases of creating a collection inside a multi-document transaction, both * committing and aborting. * - * @tags: [uses_transactions, - * # Creating collections inside multi-document transactions is supported only in v4.4 - * # onwards. - * requires_fcv_44] + * @tags: [ + * uses_transactions, + * ] */ (function() { "use strict"; diff --git a/jstests/core/txns/create_collection_parallel.js b/jstests/core/txns/create_collection_parallel.js index a862e793043..dd63d89d417 100644 --- a/jstests/core/txns/create_collection_parallel.js +++ b/jstests/core/txns/create_collection_parallel.js @@ -1,9 +1,9 @@ -/* Tests parallel transactions with createCollections. +/** + * Tests parallel transactions with createCollections. * - * @tags: [uses_transactions, - * # Creating collections inside multi-document transactions is supported only in v4.4 - * # onwards. - * requires_fcv_44] + * @tags: [ + * uses_transactions, + * ] */ (function() { "use strict"; diff --git a/jstests/core/txns/create_existing_indexes.js b/jstests/core/txns/create_existing_indexes.js index 9cda50a6164..ce1f6489291 100644 --- a/jstests/core/txns/create_existing_indexes.js +++ b/jstests/core/txns/create_existing_indexes.js @@ -1,10 +1,11 @@ -/* Tests that attempts to create indexes that already exist as of the createIndexes call are +/** + * Tests that attempts to create indexes that already exist as of the createIndexes call are * permitted inside multi-document transactions. Also test that attempts to create new * indexes on existing collections are not permitted inside multi-document transactions. * - * @tags: [uses_transactions, - * # Creating indexes inside multi-document transactions is supported only in v4.4 onwards. - * requires_fcv_44] + * @tags: [ + * uses_transactions, + * ] */ (function() { "use strict"; diff --git a/jstests/core/txns/create_indexes.js b/jstests/core/txns/create_indexes.js index bdb88ecc13a..59f407a349f 100644 --- a/jstests/core/txns/create_indexes.js +++ b/jstests/core/txns/create_indexes.js @@ -1,10 +1,10 @@ -/* Tests simple cases of creating indexes inside a multi-document transaction, both +/** + * Tests simple cases of creating indexes inside a multi-document transaction, both * committing and aborting. * - * @tags: [uses_transactions, - * # Creating collections inside multi-document transactions is supported only in v4.4 - * # onwards. - * requires_fcv_44] + * @tags: [ + * uses_transactions, + * ] */ (function() { "use strict"; diff --git a/jstests/core/txns/create_indexes_parallel.js b/jstests/core/txns/create_indexes_parallel.js index 61a77e4a1ff..e089664f80f 100644 --- a/jstests/core/txns/create_indexes_parallel.js +++ b/jstests/core/txns/create_indexes_parallel.js @@ -1,9 +1,9 @@ -/* Tests parallel transactions with createIndexes. +/** + * Tests parallel transactions with createIndexes. * - * @tags: [uses_transactions, - * # Creating collections inside multi-document transactions is supported only in v4.4 - * # onwards. - * requires_fcv_44] + * @tags: [ + * uses_transactions, + * ] */ (function() { "use strict"; diff --git a/jstests/core/txns/implicit_collection_creation_in_txn.js b/jstests/core/txns/implicit_collection_creation_in_txn.js index c02bcef9ed4..1c80bdb3cde 100644 --- a/jstests/core/txns/implicit_collection_creation_in_txn.js +++ b/jstests/core/txns/implicit_collection_creation_in_txn.js @@ -1,6 +1,8 @@ // Tests that it is allowed to implicitly create a collection using insert or upsert in a // multi-document transaction. -// @tags: [uses_transactions, requires_fcv_44] +// @tags: [ +// uses_transactions, +// ] (function() { "use strict"; diff --git a/jstests/core/txns/prepare_conflict.js b/jstests/core/txns/prepare_conflict.js index b2c2071584c..0e7ee810c4e 100644 --- a/jstests/core/txns/prepare_conflict.js +++ b/jstests/core/txns/prepare_conflict.js @@ -1,7 +1,10 @@ /** * Tests that prepare conflicts for prepared transactions are retried. * - * @tags: [uses_transactions, uses_prepare_transaction, requires_fcv_44] + * @tags: [ + * uses_prepare_transaction, + * uses_transactions, + * ] */ (function() { "use strict"; diff --git a/jstests/core/update_affects_indexes.js b/jstests/core/update_affects_indexes.js index fd77a39194c..41b0cb4a016 100644 --- a/jstests/core/update_affects_indexes.js +++ b/jstests/core/update_affects_indexes.js @@ -1,6 +1,5 @@ // This is a regression test for SERVER-32048. It checks that index keys are correctly updated when // an update modifier implicitly creates a new array element. -// @tags: [requires_fcv_44] (function() { "use strict"; diff --git a/jstests/core/views/dbref_projection.js b/jstests/core/views/dbref_projection.js index 963a3cc185e..1aa828c3807 100644 --- a/jstests/core/views/dbref_projection.js +++ b/jstests/core/views/dbref_projection.js @@ -2,8 +2,9 @@ * Test projecting DBRef fields ($ref, $id, $db) in views. * * Legacy find() queries do not support views, so must use the find() command. - * DBRef fields are not supported in agg pre 4.4. - * @tags: [requires_find_command, requires_fcv_44] + * @tags: [ + * requires_find_command, + * ] */ (function() { "use strict"; diff --git a/jstests/core/views/views_aggregation.js b/jstests/core/views/views_aggregation.js index 2b23955a687..44e73dea033 100644 --- a/jstests/core/views/views_aggregation.js +++ b/jstests/core/views/views_aggregation.js @@ -1,16 +1,13 @@ /** * Tests aggregation on views for proper pipeline concatenation and semantics. * - * The conditions under which sorts are pushed down were changed between 4.2 and 4.4. This test - * expects the 4.4 version output of explain(). - * @tags: [requires_find_command, - * does_not_support_stepdowns, - * requires_getmore, - * requires_non_retryable_commands, - * # Requires FCV 4.4 because the test checks explain() output, and in 4.4 the conditions - * # under which sorts are pushed down were changed. Also uses $unionWith. - * requires_fcv_44, - * uses_$out] + * @tags: [ + * does_not_support_stepdowns, + * requires_find_command, + * requires_getmore, + * requires_non_retryable_commands, + * uses_$out, + * ] */ (function() { "use strict"; diff --git a/jstests/core/views/views_all_commands.js b/jstests/core/views/views_all_commands.js index d828c7432a4..9eccc39d0cd 100644 --- a/jstests/core/views/views_all_commands.js +++ b/jstests/core/views/views_all_commands.js @@ -1,19 +1,13 @@ // @tags: [ // assumes_superuser_permissions, // does_not_support_stepdowns, +// requires_emptycapped, // requires_fastcount, -// requires_fcv_44, // requires_getmore, // requires_non_retryable_commands, // requires_non_retryable_writes, // uses_map_reduce_with_temp_collections, -// requires_emptycapped, // ] -// -// Tagged as 'requires_fcv_44', since this test cannot run against versions less then 4.4. This is -// because 'planCacheListPlans' and 'planCacheListQueryShapes' were deleted in 4.4, and thus not -// tested here. But this test asserts that all commands are covered, so will fail against a version -// of the server which implements these commands. /* * Declaratively-defined tests for views for all database commands. This file contains a map of test diff --git a/jstests/core/views/views_find.js b/jstests/core/views/views_find.js index 23c6203831b..3ca5571784d 100644 --- a/jstests/core/views/views_find.js +++ b/jstests/core/views/views_find.js @@ -4,9 +4,6 @@ * @tags: [ * requires_find_command, * requires_getmore, - * # Includes tests for allowing $natural sort against a view, but support for this feature - * # requires all nodes to be binary version 4.4. - * requires_fcv_44, * ] */ (function() { diff --git a/jstests/core/views/views_validation.js b/jstests/core/views/views_validation.js index 2c4b17dd171..b8bc76bbb32 100644 --- a/jstests/core/views/views_validation.js +++ b/jstests/core/views/views_validation.js @@ -1,7 +1,5 @@ // @tags: [ // requires_non_retryable_commands, -// # Uses $unionWith. -// requires_fcv_44, // ] (function() { diff --git a/jstests/core/where_system_js.js b/jstests/core/where_system_js.js index b00f40b6896..fb9cffc87ff 100644 --- a/jstests/core/where_system_js.js +++ b/jstests/core/where_system_js.js @@ -1,12 +1,10 @@ // Tests $where use of functions defined in the system.js collection. // @tags: [ -// requires_non_retryable_writes, -// # This test expects a function stored in the system.js collection to be available to -// # $where, which may not be the case if it is implicitly sharded in a passthrough. -// assumes_unsharded_collection, -// requires_scripting, -// # $where in 4.2 accepts CodeWithScope whereas >= 4.4 does not. -// requires_fcv_44, +// # This test expects a function stored in the system.js collection to be available to $where, +// # which may not be the case if it is implicitly sharded in a passthrough. +// assumes_unsharded_collection, +// requires_non_retryable_writes, +// requires_scripting, // ] (function() { "use strict"; diff --git a/jstests/core/wildcard_index_covered_queries.js b/jstests/core/wildcard_index_covered_queries.js index 366109a2c9a..484d836ac4b 100644 --- a/jstests/core/wildcard_index_covered_queries.js +++ b/jstests/core/wildcard_index_covered_queries.js @@ -5,12 +5,10 @@ * covered unless they include the shard key. Does not support stepdowns because the test issues * getMores, which the stepdown/kill_primary passthroughs will reject. * - * @tags: [assumes_unsharded_collection, - * does_not_support_stepdowns, - * # This test attempts to project a $-prefixed field name ("$_path") which was allowed in - * # 4.2 but banned in 4.4. This test checks that the aforementioned case will throw an - * # error. - * requires_fcv_44] + * @tags: [ + * assumes_unsharded_collection, + * does_not_support_stepdowns, + * ] */ (function() { "use strict"; diff --git a/jstests/core/wildcard_index_return_key.js b/jstests/core/wildcard_index_return_key.js index 14348ac3703..53f7da8c09c 100644 --- a/jstests/core/wildcard_index_return_key.js +++ b/jstests/core/wildcard_index_return_key.js @@ -1,6 +1,5 @@ /** * Tests that $** indexes works with returnKey option. - * @tags: [requires_fcv_44] */ (function() { 'use strict'; diff --git a/jstests/core/wildcard_index_validindex.js b/jstests/core/wildcard_index_validindex.js index 6190b030965..24ecdcf77cf 100644 --- a/jstests/core/wildcard_index_validindex.js +++ b/jstests/core/wildcard_index_validindex.js @@ -1,9 +1,8 @@ /** * Tests parsing and validation of wildcard indexes. * @tags: [ - * # Uses index building in background - * requires_background_index, - * requires_fcv_44 + * # Uses index building in background + * requires_background_index, * ] */ (function() { |