From 61b3edad3a9d3fd51631aebe2af0338936d2ed20 Mon Sep 17 00:00:00 2001 From: Binh Vo <146007384+binhvomongodb@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:51:15 -0500 Subject: [PATCH] SERVER-72901 Move remaining top-level core jstests to subdirectories (#30813) GitOrigin-RevId: 0d2fb90192f7a0074b635f2707a482e8fe238cd2 --- .github/CODEOWNERS | 17 ++++++++------ ...causally_consistent_jscore_passthrough.yml | 6 ++--- ..._write_replica_sets_jscore_passthrough.yml | 6 ++--- ..._stepdown_terminate_jscore_passthrough.yml | 6 ++--- ...sets_multi_stmt_txn_jscore_passthrough.yml | 4 ++-- ..._stepdown_terminate_jscore_passthrough.yml | 4 ++-- ...causally_consistent_jscore_passthrough.yml | 4 ++-- ...sharded_collections_jscore_passthrough.yml | 4 ++-- ...rded_multi_stmt_txn_jscore_passthrough.yml | 4 ++-- ...ts_stepdown_primary_jscore_passthrough.yml | 2 +- ...ts_stepdown_primary_jscore_passthrough.yml | 2 +- .../multiversion_sanity_check.yml | 2 +- ...nity_check_last_continuous_new_new_old.yml | 2 +- ...nity_check_last_continuous_new_old_new.yml | 2 +- ...nity_check_last_continuous_old_new_new.yml | 2 +- ...sion_sanity_check_last_lts_new_new_old.yml | 2 +- ...sion_sanity_check_last_lts_new_old_new.yml | 2 +- ...sion_sanity_check_last_lts_old_new_new.yml | 2 +- ..._stepdown_terminate_jscore_passthrough.yml | 2 +- ...assthrough_last_continuous_new_new_old.yml | 2 +- ...assthrough_last_continuous_new_old_new.yml | 2 +- ...assthrough_last_continuous_old_new_new.yml | 2 +- ...score_passthrough_last_lts_new_new_old.yml | 2 +- ...score_passthrough_last_lts_new_old_new.yml | 2 +- ...score_passthrough_last_lts_old_new_new.yml | 2 +- .../replica_sets_jscore_pqs_fallback.yml | 6 ++--- .../replica_sets_jscore_pqs_hints.yml | 6 ++--- ...sets_jscore_query_shape_hash_stability.yml | 6 ++--- ...a_sets_kill_primary_jscore_passthrough.yml | 2 +- ...score_passthrough_last_lts_new_new_old.yml | 2 +- ...score_passthrough_last_lts_new_old_old.yml | 2 +- ...config_kill_primary_jscore_passthrough.yml | 2 +- ...ecordids_replicated_jscore_passthrough.yml | 8 +++---- .../sharded_collections_pqs_fallback.yml | 4 ++-- .../sharded_collections_pqs_hints.yml | 4 ++-- ...collections_query_shape_hash_stability.yml | 4 ++-- ...hrough_last_continuous_new_old_old_new.yml | 2 +- ...e_passthrough_last_lts_new_old_old_new.yml | 2 +- ..._stepdown_terminate_jscore_passthrough.yml | 2 +- .../sharding_pqs_fallback.yml | 4 ++-- .../generated_suites/sharding_pqs_hints.yml | 4 ++-- .../sharding_query_shape_hash_stability.yml | 4 ++-- .../matrix_suites/overrides/bulk_write.yml | 4 ++-- .../overrides/query_settings.yml | 4 ++-- .../overrides/recordids_replicated.yml | 6 ++--- .../replica_sets_stepdown_selector.yml | 4 ++-- ...causally_consistent_jscore_passthrough.yml | 12 +++++----- ...sharded_collections_jscore_passthrough.yml | 14 +++++------ ...ngrade_replica_sets_jscore_passthrough.yml | 8 +++---- ...sharded_collections_jscore_passthrough.yml | 8 +++---- ..._downgrade_sharding_jscore_passthrough.yml | 8 +++---- ...estore_replica_sets_jscore_passthrough.yml | 4 ++-- ...ngoq_unsigned_token_jscore_passthrough.yml | 2 +- ...ets_configsvr_param_jscore_passthrough.yml | 2 +- .../replica_sets_jscore_passthrough.yml | 2 +- ..._passthrough_with_replica_set_endpoint.yml | 4 ++-- ...g_oplog_application_jscore_passthrough.yml | 2 +- ..._stepdown_terminate_jscore_passthrough.yml | 2 +- ...s_uninitialized_fcv_jscore_passthrough.yml | 2 +- ..._passthrough_with_replica_set_endpoint.yml | 4 ++-- ...re_passthrough_with_config_transitions.yml | 2 +- ..._passthrough_with_replica_set_endpoint.yml | 2 +- ...s_uninitialized_fcv_jscore_passthrough.yml | 2 +- ...re_passthrough_with_config_transitions.yml | 4 ++-- ..._passthrough_with_replica_set_endpoint.yml | 2 +- ...g_uninitialized_fcv_jscore_passthrough.yml | 2 +- .../timeseries_crud_jscore_passthrough.yml | 23 ++++--------------- .../suites/v1index_jscore_passthrough.yml | 2 +- .../smoke_tests/server_programmability.yml | 2 +- .../resmoke_validation/test_find_suites.py | 2 +- docs/fail_points.md | 2 +- ...kports_required_for_multiversion_tests.yml | 4 ++-- jstests/core/OWNERS.yml | 21 ----------------- .../client_metadata_ismaster.js | 0 .../{ => administrative}/connection_status.js | 0 jstests/core/{ => administrative}/dbadmin.js | 0 jstests/core/{ => administrative}/filemd5.js | 0 jstests/core/{ => administrative}/fsync.js | 0 .../hello_response_validation.js | 0 .../core/{ => administrative}/roles_info.js | 0 .../list_namespaces_invalidation.js | 0 .../core/cluster_scalability_misc/OWNERS.yml | 5 ++++ .../splitvector.js | 0 jstests/core/{ => ddl}/db.js | 0 .../drop_collection_vs_crud_ops.js} | 0 jstests/core/{ => diagnostics}/datasize2.js | 0 .../{ => diagnostics}/datasize_validation.js | 0 jstests/core/{ => diagnostics}/dbhash.js | 0 jstests/core/{ => diagnostics}/diagdata.js | 0 jstests/core/{ => diagnostics}/hostinfo.js | 0 .../core/{ => diagnostics}/list_commands.js | 0 .../{ => diagnostics}/logprocessdetails.js | 0 .../{ => diagnostics}/opcounters_basic.js | 0 .../{ => diagnostics}/opcounters_write_cmd.js | 0 .../operation_latency_histogram.js | 0 jstests/core/{ => diagnostics}/startup_log.js | 0 .../{ => index}/compound_index_max_fields.js | 0 jstests/core/{ => index}/long_index_rename.js | 0 jstests/core/js/OWNERS.yml | 8 +++++++ jstests/core/{ => js}/json1.js | 0 jstests/core/{ => js}/jssymbol.js | 0 jstests/core/{ => js}/map1.js | 0 jstests/core/{ => js}/throw_big.js | 0 ...ands_that_do_not_write_do_not_accept_wc.js | 0 .../core/{ => query}/commands_with_uuid.js | 0 .../core/{ => query}/illegal_cmd_namespace.js | 0 jstests/core/{ => query}/read_after_optime.js | 0 .../{ => repro}/commands_namespace_parsing.js | 0 jstests/core/{ => repro}/dbcase.js | 0 jstests/core/{ => repro}/dbcase2.js | 0 jstests/core/{ => repro}/error5.js | 0 jstests/core/{ => repro}/server25192.js | 0 jstests/core/{ => repro}/server9385.js | 0 jstests/core/{ => shell}/bench_test1.js | 0 jstests/core/{ => shell}/bench_test2.js | 0 .../{ => shell}/benchrun_cmd_param_error.js | 0 .../{ => shell}/benchrun_pipeline_updates.js | 0 .../connection_string_validation.js | 0 jstests/core/{ => shell}/loadserverscripts.js | 0 jstests/core/{ => shell}/optime_cmp.js | 0 .../{ => shell}/role_management_helpers.js | 0 jstests/core/{ => shell}/run_program1.js | 0 .../test_command_line_test_helpers.js | 0 .../version_api_list_commands_verification.js | 0 .../version_api_v1_command_coverage.js | 0 jstests/core/testing/OWNERS.yml | 5 ++++ .../{ => testing}/failcommand_failpoint.js | 0 jstests/core/{ => testing}/hash.js | 0 .../mixed_version_replica_set.js | 0 .../ddl}/rename_system_buckets_collections.js | 0 jstests/core/{ => write}/depth_limit.js | 0 jstests/core/{ => write}/no_db_created.js | 0 jstests/core/{ => write}/storefunc.js | 0 jstests/core/{ => write}/ts1.js | 0 jstests/core/{ => write}/uniqueness.js | 0 135 files changed, 158 insertions(+), 173 deletions(-) rename jstests/core/{ => administrative}/client_metadata_ismaster.js (100%) rename jstests/core/{ => administrative}/connection_status.js (100%) rename jstests/core/{ => administrative}/dbadmin.js (100%) rename jstests/core/{ => administrative}/filemd5.js (100%) rename jstests/core/{ => administrative}/fsync.js (100%) rename jstests/core/{ => administrative}/hello_response_validation.js (100%) rename jstests/core/{ => administrative}/roles_info.js (100%) rename jstests/core/{ => catalog}/list_namespaces_invalidation.js (100%) create mode 100644 jstests/core/cluster_scalability_misc/OWNERS.yml rename jstests/core/{ => cluster_scalability_misc}/splitvector.js (100%) rename jstests/core/{ => ddl}/db.js (100%) rename jstests/core/{validate_commands_after_coll_drop.js => ddl/drop_collection_vs_crud_ops.js} (100%) rename jstests/core/{ => diagnostics}/datasize2.js (100%) rename jstests/core/{ => diagnostics}/datasize_validation.js (100%) rename jstests/core/{ => diagnostics}/dbhash.js (100%) rename jstests/core/{ => diagnostics}/diagdata.js (100%) rename jstests/core/{ => diagnostics}/hostinfo.js (100%) rename jstests/core/{ => diagnostics}/list_commands.js (100%) rename jstests/core/{ => diagnostics}/logprocessdetails.js (100%) rename jstests/core/{ => diagnostics}/opcounters_basic.js (100%) rename jstests/core/{ => diagnostics}/opcounters_write_cmd.js (100%) rename jstests/core/{ => diagnostics}/operation_latency_histogram.js (100%) rename jstests/core/{ => diagnostics}/startup_log.js (100%) rename jstests/core/{ => index}/compound_index_max_fields.js (100%) rename jstests/core/{ => index}/long_index_rename.js (100%) create mode 100644 jstests/core/js/OWNERS.yml rename jstests/core/{ => js}/json1.js (100%) rename jstests/core/{ => js}/jssymbol.js (100%) rename jstests/core/{ => js}/map1.js (100%) rename jstests/core/{ => js}/throw_big.js (100%) rename jstests/core/{ => query}/commands_that_do_not_write_do_not_accept_wc.js (100%) rename jstests/core/{ => query}/commands_with_uuid.js (100%) rename jstests/core/{ => query}/illegal_cmd_namespace.js (100%) rename jstests/core/{ => query}/read_after_optime.js (100%) rename jstests/core/{ => repro}/commands_namespace_parsing.js (100%) rename jstests/core/{ => repro}/dbcase.js (100%) rename jstests/core/{ => repro}/dbcase2.js (100%) rename jstests/core/{ => repro}/error5.js (100%) rename jstests/core/{ => repro}/server25192.js (100%) rename jstests/core/{ => repro}/server9385.js (100%) rename jstests/core/{ => shell}/bench_test1.js (100%) rename jstests/core/{ => shell}/bench_test2.js (100%) rename jstests/core/{ => shell}/benchrun_cmd_param_error.js (100%) rename jstests/core/{ => shell}/benchrun_pipeline_updates.js (100%) rename jstests/core/{ => shell}/connection_string_validation.js (100%) rename jstests/core/{ => shell}/loadserverscripts.js (100%) rename jstests/core/{ => shell}/optime_cmp.js (100%) rename jstests/core/{ => shell}/role_management_helpers.js (100%) rename jstests/core/{ => shell}/run_program1.js (100%) rename jstests/core/{ => shell}/test_command_line_test_helpers.js (100%) rename jstests/core/{ => stable_api}/version_api_list_commands_verification.js (100%) rename jstests/core/{ => stable_api}/version_api_v1_command_coverage.js (100%) create mode 100644 jstests/core/testing/OWNERS.yml rename jstests/core/{ => testing}/failcommand_failpoint.js (100%) rename jstests/core/{ => testing}/hash.js (100%) rename jstests/core/{ => testing}/mixed_version_replica_set.js (100%) rename jstests/core/{ => timeseries/ddl}/rename_system_buckets_collections.js (100%) rename jstests/core/{ => write}/depth_limit.js (100%) rename jstests/core/{ => write}/no_db_created.js (100%) rename jstests/core/{ => write}/storefunc.js (100%) rename jstests/core/{ => write}/ts1.js (100%) rename jstests/core/{ => write}/uniqueness.js (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9f3c228745f..260d73d4a04 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -390,15 +390,8 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /jstests/concurrency/fsm_workloads_no_passthrough_with_mongod/**/external_data_source.js @10gen/query-integration-analytic-extensions @svc-auto-approve-bot # The following patterns are parsed from ./jstests/core/OWNERS.yml -/jstests/core/**/connection_string_validation.js @10gen/server-networking-and-observability @svc-auto-approve-bot -/jstests/core/**/hostinfo.js @10gen/server-networking-and-observability @svc-auto-approve-bot -/jstests/core/**/diagdata.js @10gen/server-networking-and-observability @svc-auto-approve-bot -/jstests/core/**/failcommand_failpoint.js @10gen/server-programmability @svc-auto-approve-bot /jstests/core/capped/* @10gen/server-collection-write-path @svc-auto-approve-bot /jstests/core/clustered/* @10gen/server-collection-write-path @svc-auto-approve-bot -/jstests/core/**/splitvector.js @10gen/server-cluster-scalability @svc-auto-approve-bot -/jstests/core/**/opcounters_write_cmd.js @10gen/query-integration-observability @svc-auto-approve-bot -/jstests/core/**/operation_latency_histogram.js @10gen/query-integration-observability @svc-auto-approve-bot /jstests/core/**/version_api* @10gen/query-optimization-parsers @svc-auto-approve-bot # The following patterns are parsed from ./jstests/core/administrative/current_op/OWNERS.yml @@ -416,6 +409,9 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot # The following patterns are parsed from ./jstests/core/cluster_parameters/OWNERS.yml /jstests/core/cluster_parameters/**/* @10gen/server-catalog-and-routing @svc-auto-approve-bot +# The following patterns are parsed from ./jstests/core/cluster_scalability_misc/OWNERS.yml +/jstests/core/cluster_scalability_misc/**/* @10gen/server-cluster-scalability @svc-auto-approve-bot + # The following patterns are parsed from ./jstests/core/ddl/OWNERS.yml /jstests/core/ddl/**/* @10gen/server-catalog-and-routing @svc-auto-approve-bot @@ -425,6 +421,10 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot # The following patterns are parsed from ./jstests/core/index/OWNERS.yml /jstests/core/index/**/* @10gen/query @svc-auto-approve-bot +# The following patterns are parsed from ./jstests/core/js/OWNERS.yml +/jstests/core/js/**/* @10gen/query-integration-javascript @svc-auto-approve-bot +/jstests/core/js/**/json1.js @10gen/query-optimization-parsers @svc-auto-approve-bot + # The following patterns are parsed from ./jstests/core/query/OWNERS.yml /jstests/core/query/**/* @10gen/query @svc-auto-approve-bot /jstests/core/query/**/boolean_expression_simplification.js @10gen/query-optimization-heuristic-rewrite @svc-auto-approve-bot @@ -528,6 +528,9 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot # The following patterns are parsed from ./jstests/core/replicate_record_ids/OWNERS.yml /jstests/core/replicate_record_ids/**/* @10gen/server-storage-engine-integration @svc-auto-approve-bot +# The following patterns are parsed from ./jstests/core/testing/OWNERS.yml +/jstests/core/testing/**/* @10gen/server-programmability @svc-auto-approve-bot + # The following patterns are parsed from ./jstests/core/timeseries/OWNERS.yml /jstests/core/timeseries/**/* @10gen/server-collection-write-path @svc-auto-approve-bot diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_causally_consistent_jscore_passthrough.yml index 96105abda4b..6a34a7ac087 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_causally_consistent_jscore_passthrough.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js @@ -52,11 +52,11 @@ selector: - jstests/core/**/set_param1.js - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js - jstests/core/query/parsing/write_commands_reject_unknown_fields.js - jstests/core/query/explain/explain_uuid.js - jstests/core/query/explain/explain_includes_command.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_jscore_passthrough.yml index fd3fb3c2350..2015da538aa 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_jscore_passthrough.yml @@ -42,7 +42,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js @@ -50,11 +50,11 @@ selector: - jstests/core/**/set_param1.js - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js - jstests/core/query/parsing/write_commands_reject_unknown_fields.js - jstests/core/query/explain/explain_uuid.js - jstests/core/query/explain/explain_includes_command.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml index e9a209aa3cb..569a164870b 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml @@ -99,16 +99,16 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js - jstests/core/timeseries/write/timeseries_delete_hint.js - jstests/core/**/set_param1.js - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js - jstests/core/query/parsing/write_commands_reject_unknown_fields.js - jstests/core/query/explain/explain_uuid.js - jstests/core/query/explain/explain_includes_command.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_jscore_passthrough.yml index b6b26f2a1b7..d4197549a55 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_jscore_passthrough.yml @@ -186,11 +186,11 @@ selector: - jstests/core/**/set_param1.js - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js - jstests/core/query/parsing/write_commands_reject_unknown_fields.js - jstests/core/query/explain/explain_uuid.js - jstests/core/query/explain/explain_includes_command.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_kill_stepdown_terminate_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_kill_stepdown_terminate_jscore_passthrough.yml index c87195e4aa3..82f541ca286 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_kill_stepdown_terminate_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_replica_sets_multi_stmt_txn_kill_stepdown_terminate_jscore_passthrough.yml @@ -220,11 +220,11 @@ selector: - jstests/core/**/set_param1.js - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js - jstests/core/query/parsing/write_commands_reject_unknown_fields.js - jstests/core/query/explain/explain_uuid.js - jstests/core/query/explain/explain_includes_command.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_causally_consistent_jscore_passthrough.yml index a9e4b8d8607..050a7ebc3dd 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_causally_consistent_jscore_passthrough.yml @@ -78,11 +78,11 @@ selector: - jstests/core/**/set_param1.js - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js - jstests/core/query/parsing/write_commands_reject_unknown_fields.js - jstests/core/query/explain/explain_uuid.js - jstests/core/query/explain/explain_includes_command.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_collections_jscore_passthrough.yml index 50004012ee9..8933f7915a2 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_collections_jscore_passthrough.yml @@ -78,11 +78,11 @@ selector: - jstests/core/**/set_param1.js - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js - jstests/core/query/parsing/write_commands_reject_unknown_fields.js - jstests/core/query/explain/explain_uuid.js - jstests/core/query/explain/explain_includes_command.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_multi_stmt_txn_jscore_passthrough.yml index 40495bcf21b..9e646dfc045 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_multi_stmt_txn_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/bulk_write_sharded_multi_stmt_txn_jscore_passthrough.yml @@ -201,11 +201,11 @@ selector: - jstests/core/**/set_param1.js - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js - jstests/core/query/parsing/write_commands_reject_unknown_fields.js - jstests/core/query/explain/explain_uuid.js - jstests/core/query/explain/explain_includes_command.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_change_collection_replica_sets_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_change_collection_replica_sets_stepdown_primary_jscore_passthrough.yml index ecc9d2cf263..a216c42206d 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_change_collection_replica_sets_stepdown_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_change_collection_replica_sets_stepdown_primary_jscore_passthrough.yml @@ -136,7 +136,7 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js - jstests/aggregation/**/*.js exclude_with_any_tags: - simulate_atlas_proxy_incompatible diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_pre_images_replica_sets_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_pre_images_replica_sets_stepdown_primary_jscore_passthrough.yml index f0c78f1cb2f..2942f9a796f 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_pre_images_replica_sets_stepdown_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_pre_images_replica_sets_stepdown_primary_jscore_passthrough.yml @@ -111,7 +111,7 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js - jstests/fle2/**/*.js - src/mongo/db/modules/*/jstests/fle2/**/*.js exclude_with_any_tags: diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check.yml index 5f7a42ea63c..c16642c9058 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check.yml @@ -42,7 +42,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_new_old.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_new_old.yml index 36ee4438561..1c688c41fe1 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_new_old.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_new_old.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_old_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_old_new.yml index 18c6d072961..eb07d5237ce 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_old_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_new_old_new.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_old_new_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_old_new_new.yml index fb926a97ee7..4b72aacda7a 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_old_new_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_continuous_old_new_new.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_new_old.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_new_old.yml index ddb8883663b..5d741d579a8 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_new_old.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_new_old.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_old_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_old_new.yml index 768683be073..d7be4851b3e 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_old_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_new_old_new.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_old_new_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_old_new_new.yml index c970d97b157..2fcd0f52554 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_old_new_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/multiversion_sanity_check_last_lts_old_new_new.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/no_causal_consistency_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/no_causal_consistency_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml index 6becabeea68..8c9d962f15c 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/no_causal_consistency_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/no_causal_consistency_replica_sets_kill_stepdown_terminate_jscore_passthrough.yml @@ -101,7 +101,7 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js - jstests/fle2/**/*.js - src/mongo/db/modules/*/jstests/fle2/**/*.js exclude_with_any_tags: diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_new_old.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_new_old.yml index a9e91b73225..ad85acafa50 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_new_old.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_new_old.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_old_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_old_new.yml index 265ce2026db..a4ee8b59344 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_old_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_new_old_new.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_old_new_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_old_new_new.yml index d6da11dba9e..df59fba0e87 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_old_new_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_continuous_old_new_new.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_new_old.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_new_old.yml index cbb7c77b2da..c691f4014bb 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_new_old.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_new_old.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_old_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_old_new.yml index 49d12324a23..22076ec3e81 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_old_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_new_old_new.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_old_new_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_old_new_new.yml index 236642b7fbd..16bfb920f42 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_old_new_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_passthrough_last_lts_old_new_new.yml @@ -44,7 +44,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_fallback.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_fallback.yml index 52bed5d0b94..b67daf70101 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_fallback.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_fallback.yml @@ -46,7 +46,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js @@ -57,14 +57,14 @@ selector: - jstests/core/query/query_settings/**/*.js - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js - jstests/core/timeseries/ddl/timeseries_sparse_index.js - jstests/core/administrative/getlog2.js - jstests/core/txns/speculative_snapshot_includes_all_writes.js - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js - jstests/core/clustered/clustered_collection_collation.js - jstests/core/timeseries/write/timeseries_delete_multi.js - jstests/core/timeseries/write/timeseries_simple.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_hints.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_hints.yml index 6886a87affe..1aa3507de55 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_hints.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_pqs_hints.yml @@ -49,7 +49,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js @@ -60,14 +60,14 @@ selector: - jstests/core/query/query_settings/**/*.js - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js - jstests/core/timeseries/ddl/timeseries_sparse_index.js - jstests/core/administrative/getlog2.js - jstests/core/txns/speculative_snapshot_includes_all_writes.js - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js - jstests/core/clustered/clustered_collection_collation.js - jstests/core/timeseries/write/timeseries_delete_multi.js - jstests/core/timeseries/write/timeseries_simple.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_query_shape_hash_stability.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_query_shape_hash_stability.yml index 00b64bb4554..b34866f8333 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_query_shape_hash_stability.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_jscore_query_shape_hash_stability.yml @@ -46,7 +46,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js @@ -57,14 +57,14 @@ selector: - jstests/core/query/query_settings/**/*.js - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js - jstests/core/timeseries/ddl/timeseries_sparse_index.js - jstests/core/administrative/getlog2.js - jstests/core/txns/speculative_snapshot_includes_all_writes.js - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js - jstests/core/clustered/clustered_collection_collation.js - jstests/core/timeseries/write/timeseries_delete_multi.js - jstests/core/timeseries/write/timeseries_simple.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough.yml index fcad8295088..42700f6fdc6 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough.yml @@ -101,7 +101,7 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js - jstests/fle2/**/*.js - src/mongo/db/modules/*/jstests/fle2/**/*.js exclude_with_any_tags: diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_new_old.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_new_old.yml index 8636ea06860..4b00492fac0 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_new_old.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_new_old.yml @@ -102,7 +102,7 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js - jstests/fle2/**/*.js - src/mongo/db/modules/*/jstests/fle2/**/*.js exclude_with_any_tags: diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_old_old.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_old_old.yml index 941d6dbaa86..21311ff99e9 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_old_old.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_kill_primary_jscore_passthrough_last_lts_new_old_old.yml @@ -102,7 +102,7 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js - jstests/fle2/**/*.js - src/mongo/db/modules/*/jstests/fle2/**/*.js exclude_with_any_tags: diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml index 9d6949b9fe3..eb3b17c7bef 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml @@ -105,7 +105,7 @@ selector: - jstests/core/**/geo_s2ordering.js - jstests/fle2/**/*.js - src/mongo/db/modules/*/jstests/fle2/**/*.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js exclude_with_any_tags: - assumes_standalone_mongod - requires_getmore diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_recordids_replicated_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_recordids_replicated_jscore_passthrough.yml index 9fdb3fed2dd..edab9dd3b4d 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_recordids_replicated_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_recordids_replicated_jscore_passthrough.yml @@ -42,7 +42,7 @@ selector: - jstests/core/**/set_param1.js - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js - jstests/core/timeseries/write/timeseries_update_multi.js @@ -56,11 +56,11 @@ selector: - jstests/core/catalog/agg_list_cluster_catalog_with_match.js - jstests/core/write/bulk/bulk_write_timeseries_basic.js - jstests/core/ddl/convert_to_capped.js - - jstests/core/rename_system_buckets_collections.js + - jstests/core/timeseries/ddl/rename_system_buckets_collections.js - jstests/core/query/index_correctness_pbt.js - jstests/core/query/plan_cache/cache_correctness_pbt.js - jstests/core/write/empty_ts/bypass_empty_ts_replacement_timeseries.js - - jstests/core/version_api_v1_command_coverage.js + - jstests/core/stable_api/version_api_v1_command_coverage.js - jstests/core/query/api/*.js - jstests/core/query/distinct/*.js - jstests/core/query/cursor/cursora.js @@ -70,7 +70,7 @@ selector: - jstests/core/query/find_and_modify/find_and_modify_concurrent_update.js - jstests/core/administrative/compact_keeps_indexes.js - jstests/core/query/update/update_namespace_details.js - - jstests/core/loadserverscripts.js + - jstests/core/shell/loadserverscripts.js - jstests/core/shell/shellstartparallel.js - jstests/core/txns/*.js - jstests/core/query/map_reduce/mr_killop.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_fallback.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_fallback.yml index b9a43018a3e..dd50cfc4670 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_fallback.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_fallback.yml @@ -86,14 +86,14 @@ selector: - jstests/core/query/query_settings/**/*.js - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js - jstests/core/timeseries/ddl/timeseries_sparse_index.js - jstests/core/administrative/getlog2.js - jstests/core/txns/speculative_snapshot_includes_all_writes.js - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js - jstests/core/clustered/clustered_collection_collation.js - jstests/core/timeseries/write/timeseries_delete_multi.js - jstests/core/timeseries/write/timeseries_simple.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_hints.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_hints.yml index c216ee4cd15..b2560ea8683 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_hints.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_pqs_hints.yml @@ -88,14 +88,14 @@ selector: - jstests/core/query/query_settings/**/*.js - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js - jstests/core/timeseries/ddl/timeseries_sparse_index.js - jstests/core/administrative/getlog2.js - jstests/core/txns/speculative_snapshot_includes_all_writes.js - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js - jstests/core/clustered/clustered_collection_collation.js - jstests/core/timeseries/write/timeseries_delete_multi.js - jstests/core/timeseries/write/timeseries_simple.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_query_shape_hash_stability.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_query_shape_hash_stability.yml index 941f001518b..07d8f4389bb 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_query_shape_hash_stability.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharded_collections_query_shape_hash_stability.yml @@ -85,14 +85,14 @@ selector: - jstests/core/query/query_settings/**/*.js - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js - jstests/core/timeseries/ddl/timeseries_sparse_index.js - jstests/core/administrative/getlog2.js - jstests/core/txns/speculative_snapshot_includes_all_writes.js - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js - jstests/core/clustered/clustered_collection_collation.js - jstests/core/timeseries/write/timeseries_delete_multi.js - jstests/core/timeseries/write/timeseries_simple.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_continuous_new_old_old_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_continuous_new_old_old_new.yml index f92927ac348..6e705550700 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_continuous_new_old_old_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_continuous_new_old_old_new.yml @@ -126,7 +126,7 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js exclude_with_any_tags: - assumes_standalone_mongod - assumes_against_mongod_not_mongos diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_lts_new_old_old_new.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_lts_new_old_old_new.yml index 2c8564dd27a..b2a98cf3f23 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_lts_new_old_old_new.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_primaries_jscore_passthrough_last_lts_new_old_old_new.yml @@ -126,7 +126,7 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js exclude_with_any_tags: - assumes_standalone_mongod - assumes_against_mongod_not_mongos diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_stepdown_terminate_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_stepdown_terminate_jscore_passthrough.yml index fef064f1f7d..7375e97b1b4 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_stepdown_terminate_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_stepdown_terminate_jscore_passthrough.yml @@ -126,7 +126,7 @@ selector: - jstests/core/**/startup_log.js - jstests/core/**/shell_connection_strings.js - jstests/core/**/geo_s2ordering.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js exclude_with_any_tags: - assumes_standalone_mongod - assumes_against_mongod_not_mongos diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_fallback.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_fallback.yml index 2765d83fec0..9e0bf489571 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_fallback.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_fallback.yml @@ -63,14 +63,14 @@ selector: - jstests/core/query/query_settings/**/*.js - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js - jstests/core/timeseries/ddl/timeseries_sparse_index.js - jstests/core/administrative/getlog2.js - jstests/core/txns/speculative_snapshot_includes_all_writes.js - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js - jstests/core/clustered/clustered_collection_collation.js - jstests/core/timeseries/write/timeseries_delete_multi.js - jstests/core/timeseries/write/timeseries_simple.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_hints.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_hints.yml index bf2923242d4..ec5c7e30e8b 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_hints.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_pqs_hints.yml @@ -66,14 +66,14 @@ selector: - jstests/core/query/query_settings/**/*.js - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js - jstests/core/timeseries/ddl/timeseries_sparse_index.js - jstests/core/administrative/getlog2.js - jstests/core/txns/speculative_snapshot_includes_all_writes.js - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js - jstests/core/clustered/clustered_collection_collation.js - jstests/core/timeseries/write/timeseries_delete_multi.js - jstests/core/timeseries/write/timeseries_simple.js diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_query_shape_hash_stability.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_query_shape_hash_stability.yml index 93a7724c9c3..7e75b19ed1e 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_query_shape_hash_stability.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_query_shape_hash_stability.yml @@ -63,14 +63,14 @@ selector: - jstests/core/query/query_settings/**/*.js - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js - jstests/core/timeseries/ddl/timeseries_sparse_index.js - jstests/core/administrative/getlog2.js - jstests/core/txns/speculative_snapshot_includes_all_writes.js - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js - jstests/core/clustered/clustered_collection_collation.js - jstests/core/timeseries/write/timeseries_delete_multi.js - jstests/core/timeseries/write/timeseries_simple.js diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/bulk_write.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/bulk_write.yml index 77861146f07..4d64fc3dda7 100644 --- a/buildscripts/resmokeconfig/matrix_suites/overrides/bulk_write.yml +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/bulk_write.yml @@ -18,14 +18,14 @@ # BulkWrite profiling and currentOp output format is not the same as normal writes. - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js # Runs an update with illegal format (no 'updates'). We could work around this in the override # but it is very annoying. - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js # Requires specific commands to be run to trigger failpoint (i.e. requires insert, we run bulkWrite). - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js # This test adds unknown fields to insert/update/delete ops which we ignore - jstests/core/query/parsing/write_commands_reject_unknown_fields.js # Expects explain to fail for using UUID instead of collection name. diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/query_settings.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/query_settings.yml index 1372ce7d8ed..8958c7717b1 100644 --- a/buildscripts/resmokeconfig/matrix_suites/overrides/query_settings.yml +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/query_settings.yml @@ -13,7 +13,7 @@ # this suite might cause the tests to fail. - jstests/core/administrative/current_op/**/*.js - jstests/core/query/collation/collation.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/query/top/top.js - jstests/core/views/views_stats.js - jstests/core/txns/timestamped_reads_wait_for_prepare_oplog_visibility.js # failpoint 'timesEntered' @@ -24,7 +24,7 @@ # Failpoint interferes with majority commited writes. - jstests/core/txns/speculative_snapshot_includes_all_writes.js # Using collection UUID in explain is forbidden. - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js # This test performs an '{_id: }' query with a collator. This will not pass query settings validation. This # is a design decision due to mongos lacking collation information. - jstests/core/clustered/clustered_collection_collation.js diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/recordids_replicated.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/recordids_replicated.yml index 8a1a0730d1d..40e2144654d 100644 --- a/buildscripts/resmokeconfig/matrix_suites/overrides/recordids_replicated.yml +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/recordids_replicated.yml @@ -16,12 +16,12 @@ - jstests/core/catalog/agg_list_cluster_catalog_with_match.js - jstests/core/write/bulk/bulk_write_timeseries_basic.js - jstests/core/ddl/convert_to_capped.js - - jstests/core/rename_system_buckets_collections.js + - jstests/core/timeseries/ddl/rename_system_buckets_collections.js - jstests/core/query/index_correctness_pbt.js - jstests/core/query/plan_cache/cache_correctness_pbt.js - jstests/core/write/empty_ts/bypass_empty_ts_replacement_timeseries.js # due to error: "BSON field 'create.recordIdsReplicated' is not allowed with apiStrict:true." - - jstests/core/version_api_v1_command_coverage.js + - jstests/core/stable_api/version_api_v1_command_coverage.js - jstests/core/query/api/*.js # due to error: Error: [0] != [1] are not equal : encountered an error in the parallel shell - jstests/core/query/distinct/*.js @@ -32,7 +32,7 @@ - jstests/core/query/find_and_modify/find_and_modify_concurrent_update.js - jstests/core/administrative/compact_keeps_indexes.js - jstests/core/query/update/update_namespace_details.js - - jstests/core/loadserverscripts.js + - jstests/core/shell/loadserverscripts.js - jstests/core/shell/shellstartparallel.js # due to error: "Transaction with { txnNumber: 0 } has been aborted." # The overrides don't work with renaming collections in general. diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml index 49d1be6d13e..7d0db6e98b7 100644 --- a/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml @@ -52,7 +52,7 @@ - jstests/core/**/geo_s2ordering.js # This test may fail due to network errors and does not test server behavior, so exclude it. - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js - name: kill_primary_jscore_passthrough_exclude_files_fle value: @@ -139,7 +139,7 @@ - src/mongo/db/modules/*/jstests/fle2/**/*.js # This test may fail due to network errors and does not test server behavior, so exclude it. - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js - name: kill_primary_jscore_passthrough_exclude_with_any_tags value: diff --git a/buildscripts/resmokeconfig/suites/bulk_write_multi_op_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/bulk_write_multi_op_causally_consistent_jscore_passthrough.yml index d0b0ad272e7..a240ce5bf7f 100644 --- a/buildscripts/resmokeconfig/suites/bulk_write_multi_op_causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/bulk_write_multi_op_causally_consistent_jscore_passthrough.yml @@ -13,14 +13,14 @@ selector: # BulkWrite profiling and currentOp output format is not the same as normal writes. - jstests/core/**/profile*.js - jstests/core/query/comment_field.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js # Runs an update with illegal format (no 'updates'). We could work around this in the override # but it is very annoying. - jstests/core/write/insert/batch_write_command_insert.js - jstests/core/query/batch_write/batch_write_command_update.js - jstests/core/query/batch_write/batch_write_command_delete.js # Requires specific commands to be run to trigger failpoint (i.e. requires insert, we run bulkWrite). - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js # This test adds unknown fields to insert/update/delete ops which we ignore - jstests/core/query/parsing/write_commands_reject_unknown_fields.js # Checks for op names which bulkWrite will not show up as @@ -42,7 +42,7 @@ selector: - jstests/core/query/update/update_affects_indexes.js - jstests/core/index/index_arr2.js - jstests/core/index/index_stats.js - - jstests/core/ts1.js + - jstests/core/write/ts1.js - jstests/core/query/compare_timestamps.js - jstests/core/query/command_let_variables.js - jstests/core/query/update/update_min_max_examples.js @@ -91,8 +91,8 @@ selector: - jstests/core/txns/no_snapshot_writes_outside_txn.js # override does not suppot benchRun - - jstests/core/benchrun_pipeline_updates.js - - jstests/core/bench_test1.js + - jstests/core/shell/benchrun_pipeline_updates.js + - jstests/core/shell/bench_test1.js # errors out due to invalid DB name - jstests/core/query/invalid_db_name.js @@ -145,7 +145,7 @@ selector: # Grabs specific stats from mongod directly which causes failure due to there being # multiple clusters. - jstests/core/administrative/current_op/currentop_cursors.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/views/views_stats.js # Sets cluster parameters, which do writes with timestamps that will vary b/w clusters. diff --git a/buildscripts/resmokeconfig/suites/bulk_write_multi_op_sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/bulk_write_multi_op_sharded_collections_jscore_passthrough.yml index db552002b15..4b4fc46de40 100644 --- a/buildscripts/resmokeconfig/suites/bulk_write_multi_op_sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/bulk_write_multi_op_sharded_collections_jscore_passthrough.yml @@ -67,7 +67,7 @@ selector: - jstests/core/query/update/update_affects_indexes.js - jstests/core/index/index_arr2.js - jstests/core/index/index_stats.js - - jstests/core/ts1.js + - jstests/core/write/ts1.js - jstests/core/query/compare_timestamps.js - jstests/core/query/command_let_variables.js - jstests/core/query/update/update_min_max_examples.js @@ -116,8 +116,8 @@ selector: - jstests/core/txns/no_snapshot_writes_outside_txn.js # override does not suppot benchRun - - jstests/core/benchrun_pipeline_updates.js - - jstests/core/bench_test1.js + - jstests/core/shell/benchrun_pipeline_updates.js + - jstests/core/shell/bench_test1.js # parallel processing causes race conditions in these tests - jstests/core/query/local_tail_capped.js @@ -172,16 +172,16 @@ selector: # Grabs specific stats from mongod directly which causes failure due to there being # multiple clusters. - jstests/core/administrative/current_op/currentop_cursors.js - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js - jstests/core/views/views_stats.js # Rely on the testingReplication field - - jstests/core/hello_response_validation.js + - jstests/core/administrative/hello_response_validation.js - jstests/core/index/geo/geo_update_btree.js - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js # Requires specific commands to be run to trigger failpoint (i.e. requires insert, we run bulkWrite). - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js # Sets cluster parameters, which do writes with timestamps that will vary b/w clusters. - jstests/core/cluster_parameters/cluster_parameter_commands.js diff --git a/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_replica_sets_jscore_passthrough.yml index fd5cf8463c5..bd8135e6840 100644 --- a/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_replica_sets_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_replica_sets_jscore_passthrough.yml @@ -65,7 +65,7 @@ selector: - src/mongo/db/modules/*/jstests/fle/fle_drivers_integration.js # Expected failure due to command count being not precise due to potential retry of index build. - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js # Expected failures due to unexpected query execution stats from restarted operations from fcv upgrade. - jstests/aggregation/sources/lookup/lookup_query_stats.js @@ -82,8 +82,8 @@ selector: - jstests/core/write/crud_ops_do_not_throw_locktimeout.js # The tests below use transactions (which are aborted on fcv upgrade/downgrade) and thus are expected to fail. - - jstests/core/role_management_helpers.js - - jstests/core/roles_info.js + - jstests/core/shell/role_management_helpers.js + - jstests/core/administrative/roles_info.js - jstests/core/views/views_all_commands.js # Queryable encryption uses internal transactions (which are aborted on fcv upgrade/downgrade). @@ -100,7 +100,7 @@ selector: - jstests/aggregation/sources/lookup/profile_lookup.js # SERVER-85456: this test uses benchRun which does not use runCommand and index creation can fail. - - jstests/core/bench_test1.js + - jstests/core/shell/bench_test1.js executor: archive: diff --git a/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharded_collections_jscore_passthrough.yml index fb39afb6bad..aaa1a41f953 100644 --- a/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharded_collections_jscore_passthrough.yml @@ -75,7 +75,7 @@ selector: - src/mongo/db/modules/*/jstests/fle/fle_drivers_integration.js # Expected failure due to command count being not precise due to potential retry of index build. - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js # Expected failures due to unexpected query execution stats from restarted operations from fcv upgrade. - jstests/aggregation/sources/lookup/lookup_query_stats.js @@ -174,8 +174,8 @@ selector: - jstests/core/write/crud_ops_do_not_throw_locktimeout.js # The tests below use transactions (which are aborted on fcv upgrade/downgrade) and thus are expected to fail. - - jstests/core/role_management_helpers.js - - jstests/core/roles_info.js + - jstests/core/shell/role_management_helpers.js + - jstests/core/administrative/roles_info.js - jstests/core/views/views_all_commands.js # The following test timesout due to fcv downgrade interfering with index build (see BF-29538) @@ -212,7 +212,7 @@ selector: - jstests/core/query/top/top.js # SERVER-85456: this test uses benchRun which does not use runCommand and index creation can fail. - - jstests/core/bench_test1.js + - jstests/core/shell/bench_test1.js # TODO (SERVER-95788): This test creates a capped collection and fails because this suite is not # compatible with them (they can't be sharded), but does not exclude the `requires_capped` tag. diff --git a/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharding_jscore_passthrough.yml index 11c1bbd4226..a831d87f6ba 100644 --- a/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharding_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharding_jscore_passthrough.yml @@ -50,7 +50,7 @@ selector: - src/mongo/db/modules/*/jstests/fle/fle_drivers_integration.js # Expected failure due to command count being not precise due to potential retry of index build. - - jstests/core/operation_latency_histogram.js + - jstests/core/diagnostics/operation_latency_histogram.js # Expected failures due to unexpected query execution stats from restarted operations from fcv upgrade. - jstests/aggregation/sources/lookup/lookup_query_stats.js @@ -65,8 +65,8 @@ selector: - jstests/core/write/crud_ops_do_not_throw_locktimeout.js # The tests below use transactions (which are aborted on fcv upgrade/downgrade) and thus are expected to fail. - - jstests/core/role_management_helpers.js - - jstests/core/roles_info.js + - jstests/core/shell/role_management_helpers.js + - jstests/core/administrative/roles_info.js - jstests/core/views/views_all_commands.js # Sharding specific failed: @@ -90,7 +90,7 @@ selector: - jstests/core/query/top/top.js # SERVER-85456: this test uses benchRun which does not use runCommand and index creation can fail. - - jstests/core/bench_test1.js + - jstests/core/shell/bench_test1.js # Resharding is not permitted during fcv upgrade and downgrade. - jstests/core_sharding/resharding/*.js diff --git a/buildscripts/resmokeconfig/suites/magic_restore_replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/magic_restore_replica_sets_jscore_passthrough.yml index 210872515cd..c4dd6af69d2 100644 --- a/buildscripts/resmokeconfig/suites/magic_restore_replica_sets_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/magic_restore_replica_sets_jscore_passthrough.yml @@ -31,7 +31,7 @@ selector: # enters a wait state. Additionally, since the AquireCollection is not even obtained, # the curOp (current operation) does not get logged. - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js # When a transaction is in a prepared state, as seen in that test, it prevents the document edited # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction # in a prepared state for an extended period, it will result in a timeout for the dbcheck process. @@ -40,7 +40,7 @@ selector: # case. That is not always true when the test driver use a replica set connection string. As this # test sets fail point with error code NotWritablePrimary, the test driver changes its topology to # ReplicaSetNoPrimary and create a new connection once it get the primary again. - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js # Uses a view with projected out _id which causes data consistency diffs due to natural order # differences between primary and secondary nodes from parallel oplog application. diff --git a/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_unsigned_token_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_unsigned_token_jscore_passthrough.yml index 1d1aa069807..2767b1b0920 100644 --- a/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_unsigned_token_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_unsigned_token_jscore_passthrough.yml @@ -74,7 +74,7 @@ selector: - jstests/core/query/queryable_encryption/**/*.js # Failpoints do not support passing in tenancy information. - jstests/core/administrative/profile/profile_hide_index.js - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js - jstests/core/query/comment_field.js executor: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_configsvr_param_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_configsvr_param_jscore_passthrough.yml index 6558d535cdf..0b153d45225 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_configsvr_param_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_configsvr_param_jscore_passthrough.yml @@ -38,7 +38,7 @@ selector: # enters a wait state. Additionally, since the AquireCollection is not even obtained, # the curOp (current operation) does not get logged. - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js # When a transaction is in a prepared state, as seen in that test, it prevents the document edited # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction # in a prepared state for an extended period, it will result in a timeout for the dbcheck process. diff --git a/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml index 01edbe1636f..fec2fb378be 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml @@ -31,7 +31,7 @@ selector: # enters a wait state. Additionally, since the AquireCollection is not even obtained, # the curOp (current operation) does not get logged. - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js # When a transaction is in a prepared state, as seen in that test, it prevents the document edited # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction # in a prepared state for an extended period, it will result in a timeout for the dbcheck process. diff --git a/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough_with_replica_set_endpoint.yml b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough_with_replica_set_endpoint.yml index 3b40bbe3133..052e079b8ba 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough_with_replica_set_endpoint.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough_with_replica_set_endpoint.yml @@ -40,7 +40,7 @@ selector: # enters a wait state. Additionally, since the AquireCollection is not even obtained, # the curOp (current operation) does not get logged. - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js # When a transaction is in a prepared state, as seen in that test, it prevents the document edited # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction # in a prepared state for an extended period, it will result in a timeout for the dbcheck process. @@ -80,7 +80,7 @@ selector: # clusters for non-existent dbs. - jstests/core/query/explain/explain_missing_database.js # This test runs {find: uuid} commands which are not supported for replica set endpoints. - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js # TODO (SERVER-80416): cloneCollectionAsCapped command stops working after a replica set # is bootstrapped as a sharded cluster. - jstests/core/query/collation/collation.js diff --git a/buildscripts/resmokeconfig/suites/replica_sets_lag_oplog_application_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_lag_oplog_application_jscore_passthrough.yml index bde4da358fa..b129ae901fa 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_lag_oplog_application_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_lag_oplog_application_jscore_passthrough.yml @@ -30,7 +30,7 @@ selector: # enters a wait state. Additionally, since the AquireCollection is not even obtained, # the curOp (current operation) does not get logged. - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js # When a transaction is in a prepared state, as seen in that test, it prevents the document edited # within it from being read by the dbcheck process. Therefore, if the test keeps the transaction # in a prepared state for an extended period, it will result in a timeout for the dbcheck process. diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_stepdown_terminate_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_stepdown_terminate_jscore_passthrough.yml index a75185d89c4..ba236879a81 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_stepdown_terminate_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_stepdown_terminate_jscore_passthrough.yml @@ -75,7 +75,7 @@ selector: # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary. - jstests/core/**/geo_s2ordering.js # This test may fail due to network errors and does not test server behavior, so exclude it. - - jstests/core/mixed_version_replica_set.js + - jstests/core/testing/mixed_version_replica_set.js exclude_with_any_tags: - assumes_standalone_mongod diff --git a/buildscripts/resmokeconfig/suites/replica_sets_uninitialized_fcv_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_uninitialized_fcv_jscore_passthrough.yml index ae1c97c06e4..bf0cf9fa504 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_uninitialized_fcv_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_uninitialized_fcv_jscore_passthrough.yml @@ -40,7 +40,7 @@ selector: - jstests/core/**/write_change_stream_pit_preimage.js # Will fail all commands including those needed to forward command to initial sync node. - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js # Starts MongoCryptD instead of mongod nodes - src/mongo/db/modules/*/jstests/fle2/fle2_bulk_write.js # These tests run many aggregations, and the override slows them down enough to hit the evergreen timeout. diff --git a/buildscripts/resmokeconfig/suites/secondary_reads_passthrough_with_replica_set_endpoint.yml b/buildscripts/resmokeconfig/suites/secondary_reads_passthrough_with_replica_set_endpoint.yml index 07195ab3048..7c81aa53ac7 100644 --- a/buildscripts/resmokeconfig/suites/secondary_reads_passthrough_with_replica_set_endpoint.yml +++ b/buildscripts/resmokeconfig/suites/secondary_reads_passthrough_with_replica_set_endpoint.yml @@ -68,7 +68,7 @@ selector: # clusters for non-existent dbs. - jstests/core/query/explain/explain_missing_database.js # This test runs {find: uuid} commands which are not supported for replica set endpoints. - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js # TODO (SERVER-80416): cloneCollectionAsCapped command stops working after a replica set # is bootstrapped as a sharded cluster. - jstests/core/query/collation/collation.js @@ -84,7 +84,7 @@ selector: # writes the test database, it should remain empty or non-existent. This suite breaks this # assumption since it enables profiling which creates the system.profile collection. - jstests/core/ddl/clone_collection_as_capped_non_existent.js - - jstests/core/no_db_created.js + - jstests/core/write/no_db_created.js - jstests/core/query/explain/explain_find_and_modify.js # The test below expects the listCollections command that it runs to not validate the views # that the collection has since the command uses the special filter used by initial sync which diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_config_transitions.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_config_transitions.yml index 7658193d937..2e03acf9927 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_config_transitions.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_config_transitions.yml @@ -174,7 +174,7 @@ selector: # concurrent migration fails due to the config shard transitioning to dedicated. - jstests/core/administrative/cleanup_orphaned.js - jstests/core/views/views_all_commands.js - - jstests/core/commands_namespace_parsing.js + - jstests/core/repro/commands_namespace_parsing.js # Runs commands using legacy queries, which are not supported on sessions. - jstests/core/**/query/exhaust.js # TODO SERVER-96199 Re-enable this test once FLE updates to a document's shard key work diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_replica_set_endpoint.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_replica_set_endpoint.yml index 230df362b32..bfcf1f49e89 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_replica_set_endpoint.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough_with_replica_set_endpoint.yml @@ -66,7 +66,7 @@ selector: # The tests below are disabled because of embedded router role and replica set endpoint. # This test runs {find: uuid} commands which are not supported for replica set endpoints. - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js # This test cares about command metrics, and fails under this suite. - jstests/core/query/query_settings/query_settings_reject_application.js # The 'queryShapeHash' is only computed on mongos in sharded clusters, therefore the test will fail diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_uninitialized_fcv_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_uninitialized_fcv_jscore_passthrough.yml index 5234d72d23f..f44e19f7912 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_uninitialized_fcv_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_uninitialized_fcv_jscore_passthrough.yml @@ -92,7 +92,7 @@ selector: - jstests/core/**/sort_array.js # Will fail all commands including those needed to forward command to initial sync node. - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js # Starts MongoCryptD instead of mongod nodes - src/mongo/db/modules/*/jstests/fle2/fle2_bulk_write.js # These tests run many aggregations, and the override slows them down enough to hit the evergreen timeout. diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_config_transitions.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_config_transitions.yml index 8708ec47b52..35c39ecbf8f 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_config_transitions.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_config_transitions.yml @@ -48,7 +48,7 @@ selector: # along with the MovePrimaryInProgress error. Since this test sets times: n # for some of the failpoints, by the time we retry, the failpoint will no # longer be active and the test will fail. - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js # TODO (SERVER-90646): Re-enable background_unique_indexes.js in config transition suites. - jstests/core/ddl/background_unique_indexes.js @@ -57,7 +57,7 @@ selector: # concurrent migration fails due to the config shard transitioning to dedicated. - jstests/core/administrative/cleanup_orphaned.js - jstests/core/views/views_all_commands.js - - jstests/core/commands_namespace_parsing.js + - jstests/core/repro/commands_namespace_parsing.js # TODO SERVER-96199 Re-enable this test once FLE updates to a document's shard key work - src/mongo/db/modules/enterprise/jstests/fle2/find_and_modify_replace.js # TODO SERVER-86443 Enable test once featureFlagTrackUnshardedCollectionsUponCreation is enabled diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_replica_set_endpoint.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_replica_set_endpoint.yml index c4802b84d1c..5326575e84d 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_replica_set_endpoint.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough_with_replica_set_endpoint.yml @@ -42,7 +42,7 @@ selector: - jstests/core/query/find_and_modify/find_and_modify_metrics.js - jstests/core/query/update/update_metrics.js # This test runs {find: uuid} commands which are not supported for replica set endpoints. - - jstests/core/commands_with_uuid.js + - jstests/core/query/commands_with_uuid.js # TODO (SERVER-80416): cloneCollectionAsCapped command stops working after a replica set # is bootstrapped as a sharded cluster. - jstests/core/query/collation/collation.js diff --git a/buildscripts/resmokeconfig/suites/sharding_uninitialized_fcv_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_uninitialized_fcv_jscore_passthrough.yml index 52a6ce9e4eb..bc8d05418d7 100644 --- a/buildscripts/resmokeconfig/suites/sharding_uninitialized_fcv_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_uninitialized_fcv_jscore_passthrough.yml @@ -65,7 +65,7 @@ selector: - jstests/core/**/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. # Will fail all commands including those needed to forward command to initial sync node. - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js # Starts MongoCryptD instead of mongod nodes - src/mongo/db/modules/*/jstests/fle2/fle2_bulk_write.js # analyzeShardKey cannot run directly on a shard replica set diff --git a/buildscripts/resmokeconfig/suites/timeseries_crud_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/timeseries_crud_jscore_passthrough.yml index 54b18cc8629..0150f65d35f 100644 --- a/buildscripts/resmokeconfig/suites/timeseries_crud_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/timeseries_crud_jscore_passthrough.yml @@ -2,7 +2,6 @@ test_kind: js_test selector: roots: - - jstests/core/*.js - jstests/core/query/**/*.js - jstests/core/write/**/*.js exclude_files: @@ -21,7 +20,7 @@ selector: - jstests/core/query/find_with_resume_after_param.js - jstests/core/query/or_use_clustered_collection.js # Unique indexes. - - jstests/core/uniqueness.js + - jstests/core/write/uniqueness.js - jstests/core/query/bulk/bulk_api_ordered.js - jstests/core/query/bulk/bulk_api_unordered.js # Time-series is not compatible with viewOn. @@ -31,7 +30,6 @@ selector: - jstests/core/query/collection_uuid_find.js - jstests/core/query/parsing/collection_uuid_write_commands.js # Time-series is not allowed with an explicit validator. - - jstests/core/list_namespaces_invalidation.js - jstests/core/query/bulk/bulk_write.js - jstests/core/write/bulk/bulk_write_non_transaction.js # Sparse indexes. @@ -130,12 +128,10 @@ selector: # Update operator results in document without a time field. - jstests/core/query/find_and_modify/collation_find_and_modify.js # The passthrough creates collections implicitly. - - jstests/core/no_db_created.js + - jstests/core/write/no_db_created.js - jstests/core/query/invalid_db_name.js # Time-series collections have different _id properties. - - jstests/core/dbhash.js - jstests/core/query/embedded_dollar_prefixed_field_validation.js - - jstests/core/failcommand_failpoint.js - jstests/core/query/field_name_validation.js - jstests/core/query/regex/regex_not_id.js - jstests/core/query/rename/rename_operator.js @@ -157,13 +153,8 @@ selector: - jstests/core/query/top/top.js - jstests/core/query/top/top_drop.js # Buckets collection creates compounded secondary indexes, which is not compatible with wildcard indexes. - - jstests/core/compound_index_max_fields.js - jstests/core/query/update/update_with_pipeline.js # Operations not allowed on views. - - jstests/core/datasize2.js # locking - - jstests/core/datasize_validation.js # locking - - jstests/core/filemd5.js # locking - - jstests/core/long_index_rename.js # rename - jstests/core/query/project/positional_projection_multiple_array_fields.js # $slice - jstests/core/query/elemmatch/**/*.js # $elemMatch - jstests/core/query/plan_cache/elem_match_index_diff_types.js # $elemMatch @@ -173,7 +164,6 @@ selector: - jstests/core/query/project/slice1.js # $slice - jstests/core/query/find_and_modify/find_and_modify_positional_new_remove.js # $elemMatch # Time-series collections are views which don't support map-reduce - - jstests/core/commands_namespace_parsing.js - jstests/core/query/map_reduce/constructors.js - jstests/core/query/function_string_representations.js - jstests/core/query/map_reduce/map_reduce_validation.js @@ -181,12 +171,10 @@ selector: - jstests/core/query/map_reduce/**/*.js - jstests/core/query/recursion.js # Incompatible aggregation operations. - - jstests/core/benchrun_pipeline_updates.js - jstests/core/query/command_let_variables_merge_only.js # merge - jstests/core/query/exhaust.js # singleBatch - jstests/core/query/kill_cursors.js # noCursorTimeout - jstests/core/query/min_max_bounds.js # min - - jstests/core/operation_latency_histogram.js - jstests/core/query/project/positional_projection.js # Positional projection - jstests/core/query/batch_size.js # singleBatch - jstests/core/query/dbref/dbref3.js # Positional projection @@ -256,7 +244,7 @@ selector: # Different error message due to the override. - jstests/core/query/update/update_arrayFilters.js # TODO(SERVER-84158): Try to include this test(s). - - jstests/core/depth_limit.js + - jstests/core/write/depth_limit.js - jstests/core/query/mod/mod_with_where.js - jstests/core/query/and/and.js - jstests/core/query/cursor/cursora.js @@ -272,7 +260,7 @@ selector: - jstests/core/query/resume_query.js - jstests/core/query/resume_query_from_non_existent_record.js # Inserting into a time-series collection does not replace top-level empty timestamps. - - jstests/core/ts1.js + - jstests/core/write/ts1.js # Cursor manipulation incompatible with count 'applySkipLimit' option. - jstests/core/query/count/count2.js # Known unclear issues with distinct. @@ -282,7 +270,6 @@ selector: - jstests/core/query/sort/sortl.js # Parallel shell not running through the override. - jstests/core/query/comment_field.js - - jstests/core/fsync.js # Time-series buckets processing may have different cursor behavior. - jstests/core/query/cursor/getmore_invalidated_cursors.js # For inserts on time-series collections, mongod does _not_ replace empty timestamp values @@ -292,8 +279,6 @@ selector: - jstests/core/write/empty_ts/bypass_empty_ts_replacement.js - jstests/core/write/empty_ts/bypass_empty_ts_replacement_bulk_write.js - jstests/core/write/empty_ts/bypass_empty_ts_replacement_timeseries.js - # Assumes collection options do not change - - jstests/core/rename_system_buckets_collections.js # Change stream pre-/post-images are not available for time-series collections. - jstests/core/query/change_streams_pre_and_post_images_in_create_and_collmod.js # Inserts documents that are too large for a timeseries collection. diff --git a/buildscripts/resmokeconfig/suites/v1index_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/v1index_jscore_passthrough.yml index 34005677d75..e76201af541 100644 --- a/buildscripts/resmokeconfig/suites/v1index_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/v1index_jscore_passthrough.yml @@ -29,7 +29,7 @@ selector: # These tests fails while DbCheck running in the background: - jstests/core/query/awaitdata_getmore_cmd.js - jstests/core/administrative/current_op/currentop.js - - jstests/core/fsync.js + - jstests/core/administrative/fsync.js - jstests/core/txns/prepare_conflict.js - jstests/core/txns/prepare_conflict_aggregation_behavior.js exclude_with_any_tags: diff --git a/buildscripts/smoke_tests/server_programmability.yml b/buildscripts/smoke_tests/server_programmability.yml index cd086fed6ad..bef6423b606 100644 --- a/buildscripts/smoke_tests/server_programmability.yml +++ b/buildscripts/smoke_tests/server_programmability.yml @@ -6,7 +6,7 @@ suites: core: - - jstests/core/failcommand_failpoint.js + - jstests/core/testing/failcommand_failpoint.js failpoints: - jstests/fail_point/*.js diff --git a/buildscripts/tests/resmoke_validation/test_find_suites.py b/buildscripts/tests/resmoke_validation/test_find_suites.py index c123a71c9bd..f4b278a788e 100644 --- a/buildscripts/tests/resmoke_validation/test_find_suites.py +++ b/buildscripts/tests/resmoke_validation/test_find_suites.py @@ -8,7 +8,7 @@ from buildscripts.resmokelib.suitesconfig import get_suite class TestFindSuites(unittest.TestCase): def test_find_suites(self): - jstests = glob.glob("jstests/core/*.js") + jstests = glob.glob("jstests/core/testing/*.js") resmoke_process = subprocess.run( ["python3", "buildscripts/resmoke.py", "find-suites", jstests[0]], stdout=subprocess.PIPE, diff --git a/docs/fail_points.md b/docs/fail_points.md index 9d67cfa2bb1..6226167901f 100644 --- a/docs/fail_points.md +++ b/docs/fail_points.md @@ -58,5 +58,5 @@ between nodes like invalid replica set configurations. For examples of use, see [fail_point_commands]: ../src/mongo/db/commands/fail_point_cmd.cpp [fail_point_util]: ../jstests/libs/fail_point_util.js [fail_point_javascript_test]: ../jstests/fail_point/fail_point.js -[fail_command_javascript_test]: ../jstests/core/failcommand_failpoint.js +[fail_command_javascript_test]: ../jstests/core/testing/failcommand_failpoint.js [test_only]: test_commands.md diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml index 3a33fe0ea4d..33094fdd2c6 100644 --- a/etc/backports_required_for_multiversion_tests.yml +++ b/etc/backports_required_for_multiversion_tests.yml @@ -343,7 +343,7 @@ last-continuous: ticket: SERVER-94259 - test_file: jstests/core/timeseries/ddl/timeseries_drop.js ticket: SERVER-94829 - - test_file: jstests/core/connection_status.js + - test_file: jstests/core/administrative/connection_status.js ticket: SERVER-95952 - test_file: jstests/sharding/resharding_skip_cloning_and_applying.js ticket: SERVER-91109 @@ -735,7 +735,7 @@ last-lts: ticket: SERVER-94259 - test_file: jstests/core/timeseries/ddl/timeseries_drop.js ticket: SERVER-94829 - - test_file: jstests/core/connection_status.js + - test_file: jstests/core/administrative/connection_status.js ticket: SERVER-95952 - test_file: jstests/sharding/resharding_skip_cloning_and_applying.js ticket: SERVER-91109 diff --git a/jstests/core/OWNERS.yml b/jstests/core/OWNERS.yml index 3ea69fac985..ef47ee38c59 100644 --- a/jstests/core/OWNERS.yml +++ b/jstests/core/OWNERS.yml @@ -1,32 +1,11 @@ version: 1.0.0 filters: - - "connection_string_validation.js": - approvers: - - 10gen/server-networking-and-observability - - "hostinfo.js": - approvers: - - 10gen/server-networking-and-observability - - "diagdata.js": - approvers: - - 10gen/server-networking-and-observability - - "failcommand_failpoint.js": - approvers: - - 10gen/server-programmability - "capped/*": approvers: - 10gen/server-collection-write-path - "clustered/*": approvers: - 10gen/server-collection-write-path - - "splitvector.js": - approvers: - - 10gen/server-cluster-scalability - - "opcounters_write_cmd.js": - approvers: - - 10gen/query-integration-observability - - "operation_latency_histogram.js": - approvers: - - 10gen/query-integration-observability - "version_api*": approvers: - 10gen/query-optimization-parsers diff --git a/jstests/core/client_metadata_ismaster.js b/jstests/core/administrative/client_metadata_ismaster.js similarity index 100% rename from jstests/core/client_metadata_ismaster.js rename to jstests/core/administrative/client_metadata_ismaster.js diff --git a/jstests/core/connection_status.js b/jstests/core/administrative/connection_status.js similarity index 100% rename from jstests/core/connection_status.js rename to jstests/core/administrative/connection_status.js diff --git a/jstests/core/dbadmin.js b/jstests/core/administrative/dbadmin.js similarity index 100% rename from jstests/core/dbadmin.js rename to jstests/core/administrative/dbadmin.js diff --git a/jstests/core/filemd5.js b/jstests/core/administrative/filemd5.js similarity index 100% rename from jstests/core/filemd5.js rename to jstests/core/administrative/filemd5.js diff --git a/jstests/core/fsync.js b/jstests/core/administrative/fsync.js similarity index 100% rename from jstests/core/fsync.js rename to jstests/core/administrative/fsync.js diff --git a/jstests/core/hello_response_validation.js b/jstests/core/administrative/hello_response_validation.js similarity index 100% rename from jstests/core/hello_response_validation.js rename to jstests/core/administrative/hello_response_validation.js diff --git a/jstests/core/roles_info.js b/jstests/core/administrative/roles_info.js similarity index 100% rename from jstests/core/roles_info.js rename to jstests/core/administrative/roles_info.js diff --git a/jstests/core/list_namespaces_invalidation.js b/jstests/core/catalog/list_namespaces_invalidation.js similarity index 100% rename from jstests/core/list_namespaces_invalidation.js rename to jstests/core/catalog/list_namespaces_invalidation.js diff --git a/jstests/core/cluster_scalability_misc/OWNERS.yml b/jstests/core/cluster_scalability_misc/OWNERS.yml new file mode 100644 index 00000000000..dce79aec52a --- /dev/null +++ b/jstests/core/cluster_scalability_misc/OWNERS.yml @@ -0,0 +1,5 @@ +version: 1.0.0 +filters: + - "*": + approvers: + - 10gen/server-cluster-scalability diff --git a/jstests/core/splitvector.js b/jstests/core/cluster_scalability_misc/splitvector.js similarity index 100% rename from jstests/core/splitvector.js rename to jstests/core/cluster_scalability_misc/splitvector.js diff --git a/jstests/core/db.js b/jstests/core/ddl/db.js similarity index 100% rename from jstests/core/db.js rename to jstests/core/ddl/db.js diff --git a/jstests/core/validate_commands_after_coll_drop.js b/jstests/core/ddl/drop_collection_vs_crud_ops.js similarity index 100% rename from jstests/core/validate_commands_after_coll_drop.js rename to jstests/core/ddl/drop_collection_vs_crud_ops.js diff --git a/jstests/core/datasize2.js b/jstests/core/diagnostics/datasize2.js similarity index 100% rename from jstests/core/datasize2.js rename to jstests/core/diagnostics/datasize2.js diff --git a/jstests/core/datasize_validation.js b/jstests/core/diagnostics/datasize_validation.js similarity index 100% rename from jstests/core/datasize_validation.js rename to jstests/core/diagnostics/datasize_validation.js diff --git a/jstests/core/dbhash.js b/jstests/core/diagnostics/dbhash.js similarity index 100% rename from jstests/core/dbhash.js rename to jstests/core/diagnostics/dbhash.js diff --git a/jstests/core/diagdata.js b/jstests/core/diagnostics/diagdata.js similarity index 100% rename from jstests/core/diagdata.js rename to jstests/core/diagnostics/diagdata.js diff --git a/jstests/core/hostinfo.js b/jstests/core/diagnostics/hostinfo.js similarity index 100% rename from jstests/core/hostinfo.js rename to jstests/core/diagnostics/hostinfo.js diff --git a/jstests/core/list_commands.js b/jstests/core/diagnostics/list_commands.js similarity index 100% rename from jstests/core/list_commands.js rename to jstests/core/diagnostics/list_commands.js diff --git a/jstests/core/logprocessdetails.js b/jstests/core/diagnostics/logprocessdetails.js similarity index 100% rename from jstests/core/logprocessdetails.js rename to jstests/core/diagnostics/logprocessdetails.js diff --git a/jstests/core/opcounters_basic.js b/jstests/core/diagnostics/opcounters_basic.js similarity index 100% rename from jstests/core/opcounters_basic.js rename to jstests/core/diagnostics/opcounters_basic.js diff --git a/jstests/core/opcounters_write_cmd.js b/jstests/core/diagnostics/opcounters_write_cmd.js similarity index 100% rename from jstests/core/opcounters_write_cmd.js rename to jstests/core/diagnostics/opcounters_write_cmd.js diff --git a/jstests/core/operation_latency_histogram.js b/jstests/core/diagnostics/operation_latency_histogram.js similarity index 100% rename from jstests/core/operation_latency_histogram.js rename to jstests/core/diagnostics/operation_latency_histogram.js diff --git a/jstests/core/startup_log.js b/jstests/core/diagnostics/startup_log.js similarity index 100% rename from jstests/core/startup_log.js rename to jstests/core/diagnostics/startup_log.js diff --git a/jstests/core/compound_index_max_fields.js b/jstests/core/index/compound_index_max_fields.js similarity index 100% rename from jstests/core/compound_index_max_fields.js rename to jstests/core/index/compound_index_max_fields.js diff --git a/jstests/core/long_index_rename.js b/jstests/core/index/long_index_rename.js similarity index 100% rename from jstests/core/long_index_rename.js rename to jstests/core/index/long_index_rename.js diff --git a/jstests/core/js/OWNERS.yml b/jstests/core/js/OWNERS.yml new file mode 100644 index 00000000000..04f39cae206 --- /dev/null +++ b/jstests/core/js/OWNERS.yml @@ -0,0 +1,8 @@ +version: 1.0.0 +filters: + - "*": + approvers: + - 10gen/query-integration-javascript + - "json1.js": + approvers: + - 10gen/query-optimization-parsers diff --git a/jstests/core/json1.js b/jstests/core/js/json1.js similarity index 100% rename from jstests/core/json1.js rename to jstests/core/js/json1.js diff --git a/jstests/core/jssymbol.js b/jstests/core/js/jssymbol.js similarity index 100% rename from jstests/core/jssymbol.js rename to jstests/core/js/jssymbol.js diff --git a/jstests/core/map1.js b/jstests/core/js/map1.js similarity index 100% rename from jstests/core/map1.js rename to jstests/core/js/map1.js diff --git a/jstests/core/throw_big.js b/jstests/core/js/throw_big.js similarity index 100% rename from jstests/core/throw_big.js rename to jstests/core/js/throw_big.js diff --git a/jstests/core/commands_that_do_not_write_do_not_accept_wc.js b/jstests/core/query/commands_that_do_not_write_do_not_accept_wc.js similarity index 100% rename from jstests/core/commands_that_do_not_write_do_not_accept_wc.js rename to jstests/core/query/commands_that_do_not_write_do_not_accept_wc.js diff --git a/jstests/core/commands_with_uuid.js b/jstests/core/query/commands_with_uuid.js similarity index 100% rename from jstests/core/commands_with_uuid.js rename to jstests/core/query/commands_with_uuid.js diff --git a/jstests/core/illegal_cmd_namespace.js b/jstests/core/query/illegal_cmd_namespace.js similarity index 100% rename from jstests/core/illegal_cmd_namespace.js rename to jstests/core/query/illegal_cmd_namespace.js diff --git a/jstests/core/read_after_optime.js b/jstests/core/query/read_after_optime.js similarity index 100% rename from jstests/core/read_after_optime.js rename to jstests/core/query/read_after_optime.js diff --git a/jstests/core/commands_namespace_parsing.js b/jstests/core/repro/commands_namespace_parsing.js similarity index 100% rename from jstests/core/commands_namespace_parsing.js rename to jstests/core/repro/commands_namespace_parsing.js diff --git a/jstests/core/dbcase.js b/jstests/core/repro/dbcase.js similarity index 100% rename from jstests/core/dbcase.js rename to jstests/core/repro/dbcase.js diff --git a/jstests/core/dbcase2.js b/jstests/core/repro/dbcase2.js similarity index 100% rename from jstests/core/dbcase2.js rename to jstests/core/repro/dbcase2.js diff --git a/jstests/core/error5.js b/jstests/core/repro/error5.js similarity index 100% rename from jstests/core/error5.js rename to jstests/core/repro/error5.js diff --git a/jstests/core/server25192.js b/jstests/core/repro/server25192.js similarity index 100% rename from jstests/core/server25192.js rename to jstests/core/repro/server25192.js diff --git a/jstests/core/server9385.js b/jstests/core/repro/server9385.js similarity index 100% rename from jstests/core/server9385.js rename to jstests/core/repro/server9385.js diff --git a/jstests/core/bench_test1.js b/jstests/core/shell/bench_test1.js similarity index 100% rename from jstests/core/bench_test1.js rename to jstests/core/shell/bench_test1.js diff --git a/jstests/core/bench_test2.js b/jstests/core/shell/bench_test2.js similarity index 100% rename from jstests/core/bench_test2.js rename to jstests/core/shell/bench_test2.js diff --git a/jstests/core/benchrun_cmd_param_error.js b/jstests/core/shell/benchrun_cmd_param_error.js similarity index 100% rename from jstests/core/benchrun_cmd_param_error.js rename to jstests/core/shell/benchrun_cmd_param_error.js diff --git a/jstests/core/benchrun_pipeline_updates.js b/jstests/core/shell/benchrun_pipeline_updates.js similarity index 100% rename from jstests/core/benchrun_pipeline_updates.js rename to jstests/core/shell/benchrun_pipeline_updates.js diff --git a/jstests/core/connection_string_validation.js b/jstests/core/shell/connection_string_validation.js similarity index 100% rename from jstests/core/connection_string_validation.js rename to jstests/core/shell/connection_string_validation.js diff --git a/jstests/core/loadserverscripts.js b/jstests/core/shell/loadserverscripts.js similarity index 100% rename from jstests/core/loadserverscripts.js rename to jstests/core/shell/loadserverscripts.js diff --git a/jstests/core/optime_cmp.js b/jstests/core/shell/optime_cmp.js similarity index 100% rename from jstests/core/optime_cmp.js rename to jstests/core/shell/optime_cmp.js diff --git a/jstests/core/role_management_helpers.js b/jstests/core/shell/role_management_helpers.js similarity index 100% rename from jstests/core/role_management_helpers.js rename to jstests/core/shell/role_management_helpers.js diff --git a/jstests/core/run_program1.js b/jstests/core/shell/run_program1.js similarity index 100% rename from jstests/core/run_program1.js rename to jstests/core/shell/run_program1.js diff --git a/jstests/core/test_command_line_test_helpers.js b/jstests/core/shell/test_command_line_test_helpers.js similarity index 100% rename from jstests/core/test_command_line_test_helpers.js rename to jstests/core/shell/test_command_line_test_helpers.js diff --git a/jstests/core/version_api_list_commands_verification.js b/jstests/core/stable_api/version_api_list_commands_verification.js similarity index 100% rename from jstests/core/version_api_list_commands_verification.js rename to jstests/core/stable_api/version_api_list_commands_verification.js diff --git a/jstests/core/version_api_v1_command_coverage.js b/jstests/core/stable_api/version_api_v1_command_coverage.js similarity index 100% rename from jstests/core/version_api_v1_command_coverage.js rename to jstests/core/stable_api/version_api_v1_command_coverage.js diff --git a/jstests/core/testing/OWNERS.yml b/jstests/core/testing/OWNERS.yml new file mode 100644 index 00000000000..358540f30a8 --- /dev/null +++ b/jstests/core/testing/OWNERS.yml @@ -0,0 +1,5 @@ +version: 1.0.0 +filters: + - "*": + approvers: + - 10gen/server-programmability diff --git a/jstests/core/failcommand_failpoint.js b/jstests/core/testing/failcommand_failpoint.js similarity index 100% rename from jstests/core/failcommand_failpoint.js rename to jstests/core/testing/failcommand_failpoint.js diff --git a/jstests/core/hash.js b/jstests/core/testing/hash.js similarity index 100% rename from jstests/core/hash.js rename to jstests/core/testing/hash.js diff --git a/jstests/core/mixed_version_replica_set.js b/jstests/core/testing/mixed_version_replica_set.js similarity index 100% rename from jstests/core/mixed_version_replica_set.js rename to jstests/core/testing/mixed_version_replica_set.js diff --git a/jstests/core/rename_system_buckets_collections.js b/jstests/core/timeseries/ddl/rename_system_buckets_collections.js similarity index 100% rename from jstests/core/rename_system_buckets_collections.js rename to jstests/core/timeseries/ddl/rename_system_buckets_collections.js diff --git a/jstests/core/depth_limit.js b/jstests/core/write/depth_limit.js similarity index 100% rename from jstests/core/depth_limit.js rename to jstests/core/write/depth_limit.js diff --git a/jstests/core/no_db_created.js b/jstests/core/write/no_db_created.js similarity index 100% rename from jstests/core/no_db_created.js rename to jstests/core/write/no_db_created.js diff --git a/jstests/core/storefunc.js b/jstests/core/write/storefunc.js similarity index 100% rename from jstests/core/storefunc.js rename to jstests/core/write/storefunc.js diff --git a/jstests/core/ts1.js b/jstests/core/write/ts1.js similarity index 100% rename from jstests/core/ts1.js rename to jstests/core/write/ts1.js diff --git a/jstests/core/uniqueness.js b/jstests/core/write/uniqueness.js similarity index 100% rename from jstests/core/uniqueness.js rename to jstests/core/write/uniqueness.js