From cc4854a927905dcf32fd0968176a706dc37ed329 Mon Sep 17 00:00:00 2001 From: Tommaso Tocci Date: Thu, 18 Feb 2021 13:26:09 +0100 Subject: SERVER-54572 Introduce assumes_standalone_mongod tag for jscore tests --- ...sally_consistent_hedged_reads_jscore_passthrough.yml | 7 +------ .../suites/causally_consistent_jscore_passthrough.yml | 7 +------ .../causally_consistent_jscore_passthrough_auth.yml | 8 +------- ...lly_consistent_read_concern_snapshot_passthrough.yml | 7 +------ buildscripts/resmokeconfig/suites/cwrwc_passthrough.yml | 9 +++------ .../suites/cwrwc_rc_majority_passthrough.yml | 6 +----- .../suites/cwrwc_wc_majority_passthrough.yml | 6 +----- ...che_replication_100ms_refresh_jscore_passthrough.yml | 8 +++----- ...che_replication_10sec_refresh_jscore_passthrough.yml | 8 +++----- ...ache_replication_1sec_refresh_jscore_passthrough.yml | 8 +++----- ...e_replication_default_refresh_jscore_passthrough.yml | 8 +++----- ..._cache_sharding_100ms_refresh_jscore_passthrough.yml | 4 +--- ..._cache_sharding_10sec_refresh_jscore_passthrough.yml | 4 +--- ...n_cache_sharding_1sec_refresh_jscore_passthrough.yml | 4 +--- ...ache_sharding_default_refresh_jscore_passthrough.yml | 4 +--- ...cal_read_write_multi_stmt_txn_jscore_passthrough.yml | 7 +------ .../multi_shard_multi_stmt_txn_jscore_passthrough.yml | 7 +------ ...d_multi_stmt_txn_kill_primary_jscore_passthrough.yml | 7 +------ ...lti_stmt_txn_stepdown_primary_jscore_passthrough.yml | 7 +------ ...multi_stmt_txn_jscore_passthrough_with_migration.yml | 7 +------ .../suites/read_concern_linearizable_passthrough.yml | 6 +----- .../suites/read_concern_majority_passthrough.yml | 6 +----- .../suites/replica_sets_initsync_jscore_passthrough.yml | 9 ++++----- .../replica_sets_initsync_static_jscore_passthrough.yml | 8 +++----- .../suites/replica_sets_jscore_passthrough.yml | 8 +++----- .../replica_sets_kill_primary_jscore_passthrough.yml | 12 +----------- ...replica_sets_kill_secondaries_jscore_passthrough.yml | 6 +----- .../replica_sets_multi_stmt_txn_jscore_passthrough.yml | 7 +------ ...s_multi_stmt_txn_kill_primary_jscore_passthrough.yml | 12 +----------- ..._sets_multi_stmt_txn_stepdown_jscore_passthrough.yml | 12 +----------- ...ti_stmt_txn_terminate_primary_jscore_passthrough.yml | 12 +----------- .../suites/replica_sets_reconfig_jscore_passthrough.yml | 6 +----- ...eplica_sets_reconfig_jscore_stepdown_passthrough.yml | 12 +----------- ...ca_sets_reconfig_kill_primary_jscore_passthrough.yml | 12 +----------- ...eplica_sets_terminate_primary_jscore_passthrough.yml | 12 +----------- .../replica_sets_update_v1_oplog_jscore_passthrough.yml | 8 +++----- .../suites/retryable_writes_jscore_passthrough.yml | 6 +----- .../retryable_writes_jscore_stepdown_passthrough.yml | 12 +----------- .../suites/secondary_reads_passthrough.yml | 6 +----- .../sharded_causally_consistent_jscore_passthrough.yml | 6 +----- ...lly_consistent_read_concern_snapshot_passthrough.yml | 6 +----- .../suites/sharded_collections_jscore_passthrough.yml | 4 +--- .../sharded_multi_stmt_txn_jscore_passthrough.yml | 8 +------- .../suites/sharding_jscore_op_query_passthrough.yml | 3 +-- .../suites/sharding_jscore_passthrough.yml | 3 +-- .../sharding_update_v1_oplog_jscore_passthrough.yml | 3 +-- .../suites/tenant_migration_jscore_passthrough.yml | 4 +--- .../suites/write_concern_majority_passthrough.yml | 6 +----- jstests/core/capped_update.js | 2 ++ jstests/core/dbadmin.js | 7 ++++++- jstests/core/hello_response_validation.js | 17 +++++++++++++---- jstests/core/opcounters_write_cmd.js | 14 ++++++++------ jstests/core/read_after_optime.js | 5 ++++- 53 files changed, 100 insertions(+), 293 deletions(-) diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml index 281b5850f6d..30f213fc7e1 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml @@ -6,10 +6,6 @@ selector: exclude_files: # Don't run these tests as transactions can only run on primaries. - jstests/core/txns/**/*.js - # Cannot specify afterClusterTime and afterOpTime. - - jstests/core/read_after_optime.js - # Not expected to pass with replica-sets. - - jstests/core/opcounters_write_cmd.js # Has conditional logic for standalone servers and replica sets, but can't distinguish the two # when connected to mongos. - jstests/core/write_result.js @@ -19,13 +15,11 @@ selector: - jstests/core/apply_ops*.js # applyOps, SERVER-1439. - jstests/core/capped_convertToCapped1.js # cloneCollectionAsCapped. - jstests/core/capped_empty.js # emptycapped. - - jstests/core/capped_update.js # uses godinsert and can't run under replication. - jstests/core/check_shard_index.js # checkShardingIndex. - jstests/core/collection_truncate.js # emptycapped. - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -98,6 +92,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos ## # The next tag corresponds to the special error thrown by the set_read_preference_secondary.js diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml index 970e2afaba2..e64f58feb85 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml @@ -6,10 +6,6 @@ selector: exclude_files: # These tests are run in causally_consistent_jscore_txns_passthrough.yml. - jstests/core/txns/**/*.js - # Cannot specify afterClusterTime and afterOpTime. - - jstests/core/read_after_optime.js - # Not expected to pass with replica-sets. - - jstests/core/opcounters_write_cmd.js # Has conditional logic for standalone servers and replica sets, but can't distinguish the two # when connected to mongos. - jstests/core/write_result.js @@ -19,13 +15,11 @@ selector: - jstests/core/apply_ops*.js # applyOps, SERVER-1439. - jstests/core/capped_convertToCapped1.js # cloneCollectionAsCapped. - jstests/core/capped_empty.js # emptycapped. - - jstests/core/capped_update.js # uses godinsert and can't run under replication. - jstests/core/check_shard_index.js # checkShardingIndex. - jstests/core/collection_truncate.js # emptycapped. - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -98,6 +92,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos ## # The next tag corresponds to the special error thrown by the set_read_preference_secondary.js diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml index 5d852322a7c..f7efea42b8e 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml @@ -16,11 +16,6 @@ selector: - jstests/core/txns/**/*.js # Skip any tests that run with auth explicitly. - jstests/core/*[aA]uth*.js - # Skip any tests that require privileges for non test databases. - # Cannot specify afterClusterTime and afterOpTime. - - jstests/core/read_after_optime.js - # Not expected to pass with replica-sets. - - jstests/core/opcounters_write_cmd.js # Has conditional logic for standalone servers and replica sets, but can't distinguish the two # when connected to mongos. - jstests/core/write_result.js @@ -30,13 +25,11 @@ selector: - jstests/core/apply_ops*.js # applyOps, SERVER-1439. - jstests/core/capped_convertToCapped1.js # cloneCollectionAsCapped. - jstests/core/capped_empty.js # emptycapped. - - jstests/core/capped_update.js # uses godinsert and can't run under replication. - jstests/core/check_shard_index.js # checkShardingIndex. - jstests/core/collection_truncate.js # emptycapped. - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -130,6 +123,7 @@ selector: exclude_with_any_tags: - assumes_against_mongod_not_mongos + - assumes_standalone_mongod ## # The next tag corresponds to the special error thrown by the set_read_preference_secondary.js # override when it refuses to replace the readPreference of a particular command. Above each tag diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_read_concern_snapshot_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_read_concern_snapshot_passthrough.yml index 31ab762f53a..a720c61c338 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_read_concern_snapshot_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_read_concern_snapshot_passthrough.yml @@ -7,16 +7,11 @@ selector: # Only the first command in a transaction allows readConcern and this suite only tests # non-transaction snapshot reads. - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # These tests use benchRun(), which isn't configured to use the overridden writeConcern. - jstests/core/bench_test*.js - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes exclude_with_any_tags: - ## + - assumes_standalone_mongod # The next two tags correspond to the special errors thrown by the # set_read_and_write_concerns.js override when it refuses to replace the readConcern or # writeConcern of a particular command. Above each tag are the message(s) that cause the tag to be diff --git a/buildscripts/resmokeconfig/suites/cwrwc_passthrough.yml b/buildscripts/resmokeconfig/suites/cwrwc_passthrough.yml index ca09948bf2d..a6aa86b707f 100644 --- a/buildscripts/resmokeconfig/suites/cwrwc_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/cwrwc_passthrough.yml @@ -7,12 +7,9 @@ test_kind: js_test selector: roots: - jstests/core/**/*.js - exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js + + exclude_with_any_tags: + - assumes_standalone_mongod executor: archive: diff --git a/buildscripts/resmokeconfig/suites/cwrwc_rc_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/cwrwc_rc_majority_passthrough.yml index 89fd0dd797e..5bc00e489d5 100644 --- a/buildscripts/resmokeconfig/suites/cwrwc_rc_majority_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/cwrwc_rc_majority_passthrough.yml @@ -9,15 +9,11 @@ selector: exclude_files: # Transactions only a readConcern argument on the first command. - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # These tests use benchRun(), which isn't configured to use the overridden writeConcern. - jstests/core/bench_test*.js - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes exclude_with_any_tags: + - assumes_standalone_mongod ## # The next three tags correspond to the special errors thrown by the # set_read_and_write_concerns.js override when it refuses to replace the readConcern or diff --git a/buildscripts/resmokeconfig/suites/cwrwc_wc_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/cwrwc_wc_majority_passthrough.yml index 1a5c6931d25..e6225833700 100644 --- a/buildscripts/resmokeconfig/suites/cwrwc_wc_majority_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/cwrwc_wc_majority_passthrough.yml @@ -9,11 +9,6 @@ selector: exclude_files: # Operations within a transaction do not support write concern. - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The shellkillop.js test spawns a parallel shell without using startParallelShell() and therefore # doesn't inherit the w="majority" write concern when performing its writes. - jstests/core/shellkillop.js @@ -40,6 +35,7 @@ selector: # These tests attempt to read from the "system.profile" collection, which may be missing entries # if a write was performed on the primary of the replica set instead. - requires_profiling + - assumes_standalone_mongod executor: archive: diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml index 743c0f0c059..881632b973a 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml @@ -4,11 +4,6 @@ selector: roots: - jstests/core/**/*.js exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The set_param1.js test attempts to compare the response from running the {getParameter: "*"} # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds" # server parameter. @@ -29,6 +24,9 @@ selector: - jstests/core/find_and_modify_metrics.js - jstests/core/update_metrics.js + exclude_with_any_tags: + - assumes_standalone_mongod + executor: archive: hooks: diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml index 0e69dd724c1..68a64326e4c 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml @@ -4,11 +4,6 @@ selector: roots: - jstests/core/**/*.js exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The set_param1.js test attempts to compare the response from running the {getParameter: "*"} # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds" # server parameter. @@ -29,6 +24,9 @@ selector: - jstests/core/find_and_modify_metrics.js - jstests/core/update_metrics.js + exclude_with_any_tags: + - assumes_standalone_mongod + executor: archive: hooks: diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml index 617ad0f95f6..8e411c7c58d 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml @@ -4,11 +4,6 @@ selector: roots: - jstests/core/**/*.js exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The set_param1.js test attempts to compare the response from running the {getParameter: "*"} # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds" # server parameter. @@ -29,6 +24,9 @@ selector: - jstests/core/find_and_modify_metrics.js - jstests/core/update_metrics.js + exclude_with_any_tags: + - assumes_standalone_mongod + executor: archive: hooks: diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml index 729baf8c162..00929a968d5 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml @@ -4,11 +4,6 @@ selector: roots: - jstests/core/**/*.js exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The set_param1.js test attempts to compare the response from running the {getParameter: "*"} # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds" # server parameter. @@ -29,6 +24,9 @@ selector: - jstests/core/find_and_modify_metrics.js - jstests/core/update_metrics.js + exclude_with_any_tags: + - assumes_standalone_mongod + executor: archive: hooks: diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml index 6c47994f682..3079819d7c1 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml @@ -18,7 +18,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +43,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -92,6 +89,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml index 43e392d4758..3966d15348f 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml @@ -18,7 +18,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +43,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -92,6 +89,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml index 0eaf8d91120..645124aca0a 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml @@ -18,7 +18,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +43,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -92,6 +89,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml index ddea9e432ff..fe9e8832f8c 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml @@ -18,7 +18,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +43,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -92,6 +89,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop diff --git a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml index 8a5ef97c70c..8097c1aa8cf 100644 --- a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml @@ -19,7 +19,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +43,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -139,9 +136,6 @@ selector: - jstests/core/updateh.js - jstests/core/updatej.js - # SERVER-38096 Mongos opCounter doesn't increase when last op causes the transaction to implicitly abort - - jstests/core/opcounters_write_cmd.js - # TODO: SERVER-38207 Cannot insert document with MaxKey shard key. - jstests/core/type8.js @@ -289,6 +283,7 @@ selector: # "writeConcern is not allowed within a multi-statement transaction" - assumes_write_concern_unchanged - assumes_against_mongod_not_mongos + - assumes_standalone_mongod # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop - assumes_no_implicit_index_creation diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml index 9d6a5a2d31f..0e4f3f35044 100644 --- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml @@ -19,7 +19,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +43,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -138,9 +135,6 @@ selector: - jstests/core/updateh.js - jstests/core/updatej.js - # SERVER-38096 Mongos opCounter doesn't increase when last op causes the transaction to implicitly abort - - jstests/core/opcounters_write_cmd.js - # TODO: SERVER-38207 Cannot insert document with MaxKey shard key. - jstests/core/type8.js @@ -312,6 +306,7 @@ selector: # "writeConcern is not allowed within a multi-statement transaction" - assumes_write_concern_unchanged - assumes_against_mongod_not_mongos + - assumes_standalone_mongod # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop - assumes_no_implicit_index_creation diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml index c7773fc20a6..7798b430827 100644 --- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml @@ -19,7 +19,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +43,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -137,9 +134,6 @@ selector: - jstests/core/updateh.js - jstests/core/updatej.js - # SERVER-38096 Mongos opCounter doesn't increase when last op causes the transaction to implicitly abort - - jstests/core/opcounters_write_cmd.js - # TODO: SERVER-38207 Cannot insert document with MaxKey shard key. - jstests/core/type8.js @@ -348,6 +342,7 @@ selector: - operations_longer_than_stepdown_interval_in_txns - assumes_against_mongod_not_mongos + - assumes_standalone_mongod # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop - assumes_no_implicit_index_creation diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml index b821a28e165..6e19c6b3a2f 100644 --- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml @@ -19,7 +19,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +43,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -137,9 +134,6 @@ selector: - jstests/core/updateh.js - jstests/core/updatej.js - # SERVER-38096 Mongos opCounter doesn't increase when last op causes the transaction to implicitly abort - - jstests/core/opcounters_write_cmd.js - # TODO: SERVER-38207 Cannot insert document with MaxKey shard key. - jstests/core/type8.js @@ -348,6 +342,7 @@ selector: - operations_longer_than_stepdown_interval_in_txns - assumes_against_mongod_not_mongos + - assumes_standalone_mongod # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop - assumes_no_implicit_index_creation diff --git a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml index 1509b9c42e3..bd139ae9bcc 100644 --- a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml +++ b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml @@ -19,7 +19,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +43,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -143,9 +140,6 @@ selector: - jstests/core/updateh.js - jstests/core/updatej.js - # SERVER-38096 Mongos opCounter doesn't increase when last op causes the transaction to implicitly abort - - jstests/core/opcounters_write_cmd.js - # TODO: SERVER-38207 Cannot insert document with MaxKey shard key. - jstests/core/type8.js @@ -320,6 +314,7 @@ selector: # "writeConcern is not allowed within a multi-statement transaction" - assumes_write_concern_unchanged - assumes_against_mongod_not_mongos + - assumes_standalone_mongod # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop - assumes_no_implicit_index_creation diff --git a/buildscripts/resmokeconfig/suites/read_concern_linearizable_passthrough.yml b/buildscripts/resmokeconfig/suites/read_concern_linearizable_passthrough.yml index 74d9971f938..c13c96218b7 100644 --- a/buildscripts/resmokeconfig/suites/read_concern_linearizable_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/read_concern_linearizable_passthrough.yml @@ -6,11 +6,6 @@ selector: exclude_files: # Linearizable read concern is not supported for transactions. - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # These tests use benchRun(), which isn't configured to use the overridden writeConcern. - jstests/core/bench_test*.js - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes @@ -31,6 +26,7 @@ selector: - assumes_read_concern_unchanged # "Cowardly refusing to override write concern of command: ..." - assumes_write_concern_unchanged + - assumes_standalone_mongod executor: archive: diff --git a/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml index fddd0302810..44dbf5e27a9 100644 --- a/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml @@ -6,11 +6,6 @@ selector: exclude_files: # Transactions only a readConcern argument on the first command. - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # These tests use benchRun(), which isn't configured to use the overridden writeConcern. - jstests/core/bench_test*.js - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes @@ -25,6 +20,7 @@ selector: - assumes_read_concern_unchanged # "Cowardly refusing to override write concern of command: ..." - assumes_write_concern_unchanged + - assumes_standalone_mongod executor: archive: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml index ae2992c1f13..149afd7971f 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml @@ -4,11 +4,6 @@ selector: roots: - jstests/core/**/*.js exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # Tests that query the system.profile collection cannot run in this suite since an initial sync # may insert unexpected operations into the profile collection. - jstests/core/profile_list_collections.js @@ -37,6 +32,10 @@ selector: # The downstream syncing node affects the top output. - jstests/core/top.js + exclude_with_any_tags: + - assumes_standalone_mongod + + run_hook_interval: &run_hook_interval 20 executor: archive: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml index 388ef3feb0b..a23bbc53753 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml @@ -4,14 +4,12 @@ selector: roots: - jstests/core/**/*.js exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # Having duplicate namespaces is not supported and will cause initial sync to fail. - jstests/core/views/duplicate_ns.js + exclude_with_any_tags: + - assumes_standalone_mongod + run_hook_interval: &run_hook_interval 20 executor: archive: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml index 4173cd32c32..12dbb235b46 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml @@ -5,11 +5,6 @@ selector: roots: - jstests/core/**/*.js exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # These tests change the transactionLifetimeLimitSeconds server parameter which conflicts with how # the CheckReplDBHashInBackground hook doesn't want transactions to be reaped while it is running. - jstests/core/txns/abort_expired_transaction.js @@ -20,6 +15,9 @@ selector: # server parameter. - jstests/core/set_param1.js + exclude_with_any_tags: + - assumes_standalone_mongod + executor: archive: hooks: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml index 49557160de3..60a1d2f31b7 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml @@ -7,11 +7,6 @@ selector: # Transactions do not support retryability of individual operations. # TODO: Remove this once it is supported (SERVER-33952). - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/capped_update.js - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js # No-op retries are not ignored by top, the profiler, or opcount. - jstests/core/operation_latency_histogram.js @@ -49,12 +44,6 @@ selector: - jstests/core/coveredIndex1.js - jstests/core/sortc.js - # Assert on the isWritablePrimary field of a hello response. If a primary steps down after - # accepting a hello command and returns before its connection is closed, the response can - # contain isWritablePrimary: false. - - jstests/core/dbadmin.js - - jstests/core/hello_response_validation.js - - jstests/core/bench_test*.js # benchRun() used for writes - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes - jstests/core/connection_string_validation.js # Does not expect a replica set connection string. @@ -71,6 +60,7 @@ selector: - jstests/core/geo_s2ordering.js exclude_with_any_tags: + - assumes_standalone_mongod ## # The next four tags correspond to the special errors thrown by the auto_retry_on_network_error.js # override when it refuses to run a certain command. Above each tag are the message(s) that cause diff --git a/buildscripts/resmokeconfig/suites/replica_sets_kill_secondaries_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_kill_secondaries_jscore_passthrough.yml index 3ccf503618d..26268b4ffa0 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_kill_secondaries_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_kill_secondaries_jscore_passthrough.yml @@ -5,11 +5,6 @@ selector: - jstests/core/*.js - jstests/core/txns/**/*.js exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The following tests perform a write with a writeConcern of w=2 when 'testingReplication' is # true. This causes the test to hang because the secondary is running with the "rsSyncApplyStop" # failpoint enabled. @@ -25,6 +20,7 @@ selector: - jstests/core/sortg.js - jstests/core/sortj.js exclude_with_any_tags: + - assumes_standalone_mongod # emptycapped is not supported with rollback using recover-to-timestamp. - requires_emptycapped diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml index fee526f5b80..46620e7b141 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml @@ -8,12 +8,6 @@ selector: # These tests already run with transactions. - jstests/core/txns/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/capped_update.js - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - ## ## Limitations with the way the runner file injects transactions. ## @@ -240,6 +234,7 @@ selector: - jstests/core/SERVER-23626.js exclude_with_any_tags: + - assumes_standalone_mongod # "Cowardly refusing to override read concern of command: ..." - assumes_read_concern_unchanged # "writeConcern is not allowed within a multi-statement transaction" diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml index 6a5467de08c..aedeb8aa15b 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml @@ -7,12 +7,6 @@ selector: # These tests already run with transactions. - jstests/core/txns/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/capped_update.js - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - ## ## Limitations with the way the runner file injects transactions. ## @@ -237,11 +231,6 @@ selector: - jstests/core/coveredIndex1.js - jstests/core/sortc.js - # Assert on the isWritablePrimary field of a hello response. If a primary steps down after - # accepting a hello command and returns before its connection is closed, the response can - # contain isWritablePrimary: false. - - jstests/core/hello_response_validation.js - - jstests/core/bench_test*.js # benchRun() used for writes - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes - jstests/core/connection_string_validation.js # Does not expect a replica set connection string. @@ -266,6 +255,7 @@ selector: - jstests/core/find_and_modify_server7660.js - jstests/core/upsert_shell.js exclude_with_any_tags: + - assumes_standalone_mongod ## # The next four tags correspond to the special errors thrown by the auto_retry_on_network_error.js # override when it refuses to run a certain command. Above each tag are the message(s) that cause diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml index 3c3ca190b55..9aa581c47c8 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml @@ -7,12 +7,6 @@ selector: # These tests already run with transactions. - jstests/core/txns/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/capped_update.js - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - ## ## Limitations with the way the runner file injects transactions. ## @@ -238,11 +232,6 @@ selector: - jstests/core/coveredIndex1.js - jstests/core/sortc.js - # Assert on the isWritablePrimary field of a hello response. If a primary steps down after - # accepting a hello command and returns before its connection is closed, the response can - # contain isWritablePrimary: false. - - jstests/core/hello_response_validation.js - - jstests/core/bench_test*.js # benchRun() used for writes - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes - jstests/core/connection_string_validation.js # Does not expect a replica set connection string. @@ -261,6 +250,7 @@ selector: - jstests/core/find_and_modify_server7660.js - jstests/core/upsert_shell.js exclude_with_any_tags: + - assumes_standalone_mongod ## # The next four tags correspond to the special errors thrown by the auto_retry_on_network_error.js # override when it refuses to run a certain command. Above each tag are the message(s) that cause diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml index 5e2b1f08091..6175702c7b5 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml @@ -7,12 +7,6 @@ selector: # These tests already run with transactions. - jstests/core/txns/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/capped_update.js - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - ## ## Limitations with the way the runner file injects transactions. ## @@ -235,11 +229,6 @@ selector: - jstests/core/coveredIndex1.js - jstests/core/sortc.js - # Assert on the isWritablePrimary field of a hello response. If a primary steps down after - # accepting a hello command and returns before its connection is closed, the response can - # contain isWritablePrimary: false. - - jstests/core/hello_response_validation.js - - jstests/core/bench_test*.js # benchRun() used for writes - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes - jstests/core/connection_string_validation.js # Does not expect a replica set connection string. @@ -268,6 +257,7 @@ selector: - jstests/core/upsert_shell.js exclude_with_any_tags: + - assumes_standalone_mongod ## # The next four tags correspond to the special errors thrown by the auto_retry_on_network_error.js # override when it refuses to run a certain command. Above each tag are the message(s) that cause diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_passthrough.yml index 8285339493b..f34a1fcac5c 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_passthrough.yml @@ -11,11 +11,6 @@ selector: # Transactions do not support retryability of individual operations. # TODO: Remove this once it is supported (SERVER-33952). - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The set_param1.js test attempts to compare the response from running the {getParameter: "*"} # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds" # server parameter. @@ -34,6 +29,7 @@ selector: - jstests/core/connection_string_validation.js # Does not expect a replica set connection string. exclude_with_any_tags: + - assumes_standalone_mongod - assumes_read_preference_unchanged - requires_sharding diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml index 87502d81c3f..2c9b0bf6182 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml @@ -11,11 +11,6 @@ selector: # Transactions do not support retryability of individual operations. # TODO: Remove this once it is supported (SERVER-33952). - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The set_param1.js test attempts to compare the response from running the {getParameter: "*"} # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds" # server parameter. @@ -48,12 +43,6 @@ selector: - jstests/core/fsync.js - jstests/core/killop_drop_collection.js - # Assert on the isWritablePrimary field of a hello response. If a primary steps down after - # accepting a hello command and returns before its connection is closed, the response can - # contain isWritablePrimary: false. - - jstests/core/dbadmin.js - - jstests/core/hello_response_validation.js - # Spawns new mongo shells, which don't retry connecting on stepdown errors. - jstests/core/shell_connection_strings.js @@ -90,6 +79,7 @@ selector: - jstests/core/shellstartparallel.js exclude_with_any_tags: + - assumes_standalone_mongod ## # The next four tags correspond to the special errors thrown by the auto_retry_on_network_error.js # override when it refuses to run a certain command. Above each tag are the message(s) that cause diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml index ce97e1fab9b..6a93aca4ae7 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml @@ -12,11 +12,6 @@ selector: # Transactions do not support retryability of individual operations. # TODO: Remove this once it is supported (SERVER-33952). - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The set_param1.js test attempts to compare the response from running the {getParameter: "*"} # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds" # server parameter. @@ -49,12 +44,6 @@ selector: - jstests/core/fsync.js - jstests/core/killop_drop_collection.js - # Assert on the isWritablePrimary field of a hello response. If a primary steps down after - # accepting a hello command and returns before its connection is closed, the response can - # contain isWritablePrimary: false. - - jstests/core/dbadmin.js - - jstests/core/hello_response_validation.js - # Spawns new mongo shells, which don't retry connecting on stepdown errors. - jstests/core/shell_connection_strings.js @@ -90,6 +79,7 @@ selector: - jstests/core/geo_s2ordering.js exclude_with_any_tags: + - assumes_standalone_mongod ## # The next four tags correspond to the special errors thrown by the auto_retry_on_network_error.js # override when it refuses to run a certain command. Above each tag are the message(s) that cause diff --git a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml index 0719c3e8ded..159bd1b9dec 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml @@ -7,11 +7,6 @@ selector: # Transactions do not support retryability of individual operations. # TODO: Remove this once it is supported (SERVER-33952). - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/capped_update.js - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js # No-op retries are not ignored by top, the profiler, or opcount. - jstests/core/operation_latency_histogram.js @@ -49,12 +44,6 @@ selector: - jstests/core/coveredIndex1.js - jstests/core/sortc.js - # Assert on the isWritablePrimary field of a hello response. If a primary steps down after - # accepting a hello command and returns before its connection is closed, the response can - # contain isWritablePrimary: false. - - jstests/core/dbadmin.js - - jstests/core/hello_response_validation.js - - jstests/core/bench_test*.js # benchRun() used for writes - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes - jstests/core/connection_string_validation.js # Does not expect a replica set connection string. @@ -68,6 +57,7 @@ selector: - jstests/core/shell_connection_strings.js exclude_with_any_tags: + - assumes_standalone_mongod ## # The next four tags correspond to the special errors thrown by the auto_retry_on_network_error.js # override when it refuses to run a certain command. Above each tag are the message(s) that cause diff --git a/buildscripts/resmokeconfig/suites/replica_sets_update_v1_oplog_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_update_v1_oplog_jscore_passthrough.yml index d6de85c459f..743099aa9e7 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_update_v1_oplog_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_update_v1_oplog_jscore_passthrough.yml @@ -4,11 +4,6 @@ selector: roots: - jstests/core/**/*.js exclude_files: - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # These tests change the transactionLifetimeLimitSeconds server parameter which conflicts with how # the CheckReplDBHashInBackground hook doesn't want transactions to be reaped while it is running. - jstests/core/txns/abort_expired_transaction.js @@ -19,6 +14,9 @@ selector: # server parameter. - jstests/core/set_param1.js + exclude_with_any_tags: + - assumes_standalone_mongod + executor: archive: hooks: diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml index ecb3ee4249f..5e119f89394 100644 --- a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml @@ -7,11 +7,6 @@ selector: # Transactions do not support retryability of individual operations. # TODO: Remove this once it is supported (SERVER-33952). - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/capped_update.js - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js # No-op retries are not ignored by top, the profiler, or opcount. - jstests/core/operation_latency_histogram.js @@ -49,6 +44,7 @@ selector: - jstests/core/batch_write_command_w0.js exclude_with_any_tags: + - assumes_standalone_mongod - does_not_support_causal_consistency - does_not_support_retryable_writes diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml index 352c6c380fe..5d40ed5fe6f 100644 --- a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml @@ -7,11 +7,6 @@ selector: # Transactions do not support retryability of individual operations. # TODO: Remove this once it is supported (SERVER-33952). - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/capped_update.js - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js # No-op retries are not ignored by top, the profiler, or opcount. - jstests/core/operation_latency_histogram.js @@ -50,12 +45,6 @@ selector: - jstests/core/coveredIndex1.js - jstests/core/sortc.js - # Assert on the isWritablePrimary field of a hello response. If a primary steps down after - # accepting a hello command and returns before its connection is closed, the response can - # contain isWritablePrimary: false. - - jstests/core/dbadmin.js - - jstests/core/hello_response_validation.js - # Spawns new mongo shells, which don't retry connecting on stepdown errors. - jstests/core/shell_connection_strings.js @@ -69,6 +58,7 @@ selector: - jstests/core/validate_cmd_ns.js # Calls _exec() directly, not retryable. exclude_with_any_tags: + - assumes_standalone_mongod ## # The next four tags correspond to the special errors thrown by the auto_retry_on_network_error.js # override when it refuses to run a certain command. Above each tag are the message(s) that cause diff --git a/buildscripts/resmokeconfig/suites/secondary_reads_passthrough.yml b/buildscripts/resmokeconfig/suites/secondary_reads_passthrough.yml index 0e2a8640a95..62440d19ce8 100644 --- a/buildscripts/resmokeconfig/suites/secondary_reads_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/secondary_reads_passthrough.yml @@ -6,11 +6,6 @@ selector: exclude_files: # Operations within a transaction do not support write concern. - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # Parallel shell is not causally consistent - jstests/core/benchrun_pipeline_updates.js @@ -34,6 +29,7 @@ selector: - jstests/core/collation.js exclude_with_any_tags: + - assumes_standalone_mongod ## # The next tag corresponds to the special error thrown by the set_read_preference_secondary.js # override when it refuses to replace the readPreference of a particular command. Above each tag diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml index aaac1b7f82d..484282db348 100644 --- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml @@ -8,8 +8,6 @@ selector: exclude_files: # These tests are run in sharded_causally_consistent_jscore_txns_passthrough. - jstests/core/txns/**/*.js - # Not expected to pass with replica-sets. - - jstests/core/opcounters_write_cmd.js # The following tests fail because a certain command or functionality is not supported by # mongos. This command or functionality is placed in a comment next to the failing test. - jstests/core/apitest_db.js # serverStatus output doesn't have storageEngine. @@ -21,7 +19,6 @@ selector: - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -43,8 +40,6 @@ selector: - jstests/core/geo_2d_explain.js # executionSuccess in different spot in explain(). - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - # Can't specify both 'afterClusterTime' and 'afterOpTime'. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/bad_index_plugin.js @@ -98,6 +93,7 @@ selector: exclude_with_any_tags: # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_against_mongod_not_mongos + - assumes_standalone_mongod - assumes_no_implicit_collection_creation_after_drop - assumes_no_implicit_index_creation - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml index 3c8d0d7c6b3..915bc0a2922 100644 --- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml @@ -8,8 +8,6 @@ selector: exclude_files: # These tests are run in sharded_causally_consistent_jscore_txns_passthrough. - jstests/core/txns/**/*.js - # Not expected to pass with replica-sets. - - jstests/core/opcounters_write_cmd.js # The following tests fail because a certain command or functionality is not supported by # mongos. This command or functionality is placed in a comment next to the failing test. - jstests/core/apitest_db.js # serverStatus output doesn't have storageEngine. @@ -21,7 +19,6 @@ selector: - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,8 +41,6 @@ selector: - jstests/core/geo_2d_explain.js # executionSuccess in different spot in explain(). - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - # Can't specify both 'afterClusterTime' and 'afterOpTime'. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/bad_index_plugin.js @@ -100,6 +95,7 @@ selector: exclude_with_any_tags: # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_against_mongod_not_mongos + - assumes_standalone_mongod - assumes_no_implicit_collection_creation_after_drop - assumes_no_implicit_index_creation - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml index 3a956aef2ae..8a28910f1a8 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml @@ -20,7 +20,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -46,8 +45,6 @@ selector: - jstests/core/geo_s2explain.js # inputStage in different spot in explain(). - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/operation_latency_histogram.js # Stats are counted differently on mongos, SERVER-24880. - # Test expects to run against a standalone, but shards in this passthrough are repl sets. - - jstests/core/read_after_optime.js # The following tests fail because they count indexes. These counts do not take into account the # additional hashed shard key indexes that are automatically added by this passthrough. - jstests/core/apitest_dbcollection.js @@ -88,6 +85,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos # Tests tagged with the following will fail because they assume collections are not sharded. - assumes_no_implicit_collection_creation_after_drop diff --git a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml index 0d63e7d2932..422b532c02c 100644 --- a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml @@ -16,7 +16,6 @@ selector: - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -44,9 +43,6 @@ selector: - jstests/core/drop.js - jstests/core/explain_upsert.js - # Test is only for stand alone mongod. - - jstests/core/read_after_optime.js - # Reads from system.views. - jstests/core/views/views_drop.js @@ -109,9 +105,6 @@ selector: - jstests/core/updateh.js - jstests/core/updatej.js - # SERVER-38096 Mongos opCounter doesn't increase when last op causes the transaction to implicitly abort - - jstests/core/opcounters_write_cmd.js - ## ## Some aggregation stages don't support snapshot readconcern. ## @@ -272,6 +265,7 @@ selector: # "writeConcern is not allowed within a multi-statement transaction" - assumes_write_concern_unchanged - assumes_against_mongod_not_mongos + - assumes_standalone_mongod # Transactions are not allowed to operate on capped collections. - requires_capped - requires_profiling diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml index 14c91807627..5562a78bb03 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_op_query_passthrough.yml @@ -13,13 +13,11 @@ selector: - jstests/core/capped6.js # captrunc. - jstests/core/capped_convertToCapped1.js # cloneCollectionAsCapped. - jstests/core/capped_empty.js # emptycapped. - - jstests/core/capped_update.js # uses godinsert and can't run under replication. - jstests/core/check_shard_index.js # checkShardingIndex. - jstests/core/collection_truncate.js # emptycapped. - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -54,6 +52,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos # system.profile collection doesn't exist on mongos. - requires_profiling diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml index 3824fb333ea..137c54e53c4 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml @@ -14,13 +14,11 @@ selector: - jstests/core/capped6.js # captrunc. - jstests/core/capped_convertToCapped1.js # cloneCollectionAsCapped. - jstests/core/capped_empty.js # emptycapped. - - jstests/core/capped_update.js # uses godinsert and can't run under replication. - jstests/core/check_shard_index.js # checkShardingIndex. - jstests/core/collection_truncate.js # emptycapped. - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -55,6 +53,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos # system.profile collection doesn't exist on mongos. - requires_profiling diff --git a/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml index c908ec4196f..6db8ef56a45 100644 --- a/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml @@ -13,13 +13,11 @@ selector: - jstests/core/capped6.js # captrunc. - jstests/core/capped_convertToCapped1.js # cloneCollectionAsCapped. - jstests/core/capped_empty.js # emptycapped. - - jstests/core/capped_update.js # uses godinsert and can't run under replication. - jstests/core/check_shard_index.js # checkShardingIndex. - jstests/core/collection_truncate.js # emptycapped. - jstests/core/collmod_without_uuid.js # applyOps, SERVER-1439 - jstests/core/compact_keeps_indexes.js # compact. - jstests/core/currentop.js # uses fsync. - - jstests/core/dbadmin.js # "local" database. - jstests/core/dbhash.js # dbhash. - jstests/core/dbhash2.js # dbhash. - jstests/core/diagdata.js # Command not supported in mongos @@ -54,6 +52,7 @@ selector: - jstests/core/txns/prepare_transaction_fails_on_temp_collections.js exclude_with_any_tags: + - assumes_standalone_mongod - assumes_against_mongod_not_mongos # system.profile collection doesn't exist on mongos. - requires_profiling diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_jscore_passthrough.yml index 2c57be3b17a..2894bd89625 100644 --- a/buildscripts/resmokeconfig/suites/tenant_migration_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/tenant_migration_jscore_passthrough.yml @@ -21,9 +21,6 @@ selector: - jstests/core/profile_hide_index.js # The override cannot deep copy very large or small dates. - jstests/core/index_large_and_small_dates.js - # These tests are not expected to pass with replica-sets. - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js # This test expects that the connection (i.e. 'threadName') does not change throughout each test # case. That is not always true when there is a background tenant migration. - jstests/core/failcommand_failpoint.js @@ -110,6 +107,7 @@ selector: - jstests/core/batch_write_command_update.js exclude_with_any_tags: + - assumes_standalone_mongod # These tests run getMore commands which are not supported in the tenant migration passthrough. - requires_getmore # Due to background tenant migrations, operations in the main test shell are not guaranteed to diff --git a/buildscripts/resmokeconfig/suites/write_concern_majority_passthrough.yml b/buildscripts/resmokeconfig/suites/write_concern_majority_passthrough.yml index 3e7bea5e5b1..d7ce6f76c58 100644 --- a/buildscripts/resmokeconfig/suites/write_concern_majority_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/write_concern_majority_passthrough.yml @@ -6,15 +6,11 @@ selector: exclude_files: # Operations within a transaction do not support write concern. - jstests/core/txns/**/*.js - # These tests are not expected to pass with replica-sets: - - jstests/core/dbadmin.js - - jstests/core/opcounters_write_cmd.js - - jstests/core/read_after_optime.js - - jstests/core/capped_update.js # The shellkillop.js test spawns a parallel shell without using startParallelShell() and therefore # doesn't inherit the w="majority" write concern when performing its writes. - jstests/core/shellkillop.js exclude_with_any_tags: + - assumes_standalone_mongod ## # The next three tags correspond to the special errors thrown by the # set_read_and_write_concerns.js override when it refuses to replace the readConcern or diff --git a/jstests/core/capped_update.js b/jstests/core/capped_update.js index d15c6939fcd..17b7f55ae39 100644 --- a/jstests/core/capped_update.js +++ b/jstests/core/capped_update.js @@ -5,6 +5,8 @@ * @tags: [ * requires_capped, * uses_testing_only_commands, + * # godinsert and can't run under replication + * assumes_standalone_mongod, * ] */ (function() { diff --git a/jstests/core/dbadmin.js b/jstests/core/dbadmin.js index 7bd946f1eef..29aaae432db 100644 --- a/jstests/core/dbadmin.js +++ b/jstests/core/dbadmin.js @@ -1,4 +1,9 @@ -load('jstests/aggregation/extras/utils.js'); +// @tags: [ +// # Assert on the isWritablePrimary field of a hello response. If a primary steps down after +// # accepting a hello command and returns before its connection is closed, the response can +// # contain isWritablePrimary: false. +// does_not_support_stepdowns, +// ] (function() { 'use strict'; diff --git a/jstests/core/hello_response_validation.js b/jstests/core/hello_response_validation.js index d4efc80462d..0094e0b8b2f 100644 --- a/jstests/core/hello_response_validation.js +++ b/jstests/core/hello_response_validation.js @@ -1,7 +1,15 @@ -/** - * This test ensures that the hello command and its aliases, ismaster and isMaster, are all - * accepted. - */ +// +// This test ensures that the hello command and its aliases, ismaster and isMaster, +// are all accepted. +// +// @tags: [ +// # Assert on the isWritablePrimary field of a hello response. If a primary steps down after +// # accepting a hello command and returns before its connection is closed, the response can +// # contain isWritablePrimary: false. +// does_not_support_stepdowns, +// ] + +(function() { "use strict"; function checkResponseFields(commandString) { @@ -88,3 +96,4 @@ assert.eq(cmdResponse1, cmdResponse2); cmdResponse1 = removeTimestamps(db.runCommand("isMaster")); cmdResponse2 = removeTimestamps(db.isMaster()); assert.eq(cmdResponse1, cmdResponse2); +})(); diff --git a/jstests/core/opcounters_write_cmd.js b/jstests/core/opcounters_write_cmd.js index 28660083cbe..ab2b832d035 100644 --- a/jstests/core/opcounters_write_cmd.js +++ b/jstests/core/opcounters_write_cmd.js @@ -1,9 +1,13 @@ // Test that opcounters get incremented properly. // @tags: [ // uses_multiple_connections, +// assumes_standalone_mongod, // ] // Legacy write mode test also available at jstests/gle. +(function() { +'use strict'; + var mongo = new Mongo(db.getMongo().host); var newdb = mongo.getDB(db.toString()); @@ -158,9 +162,9 @@ t.insert({_id: 0}); assert.commandWorked(newdb.runCommand({listCollections: 1})); // Command, recognized, no error. -serverStatus = newdb.runCommand({serverStatus: 1}); +var serverStatus = newdb.runCommand({serverStatus: 1}); opCounters = serverStatus.opcounters; -metricsObj = serverStatus.metrics.commands; +var metricsObj = serverStatus.metrics.commands; assert.eq(opCounters.command + 1, newdb.serverStatus().opcounters.command); // "serverStatus" counted // Count this and the last run of "serverStatus" @@ -172,10 +176,7 @@ assert.eq(metricsObj.serverStatus.failed, "failed ServerStatus command counter incremented!"); // "serverStatus" counted // Command, recognized, with error. -countVal = { - "total": 0, - "failed": 0 -}; +var countVal = {"total": 0, "failed": 0}; if (metricsObj.count != null) { countVal = metricsObj.count; } @@ -198,3 +199,4 @@ assert.eq(opCounters.command + 8, newdb.serverStatus().opcounters.command); // "serverStatus" counted assert.eq(null, newdb.serverStatus().metrics.commands.invalid); assert.eq(metricsObj[''] + 1, newdb.serverStatus().metrics.commands['']); +})(); diff --git a/jstests/core/read_after_optime.js b/jstests/core/read_after_optime.js index 0345b358f45..b43fdbd8bd5 100644 --- a/jstests/core/read_after_optime.js +++ b/jstests/core/read_after_optime.js @@ -1,5 +1,8 @@ // Test that attempting to read after optime fails if replication is not enabled. -// @tags: [multiversion_incompatible] +// @tags: [ +// multiversion_incompatible, +// assumes_standalone_mongod +// ] (function() { "use strict"; -- cgit v1.2.1