From a63f66c16b6023399a11ec4aeca651b65c7de521 Mon Sep 17 00:00:00 2001 From: Kaloian Manassiev Date: Wed, 13 May 2020 08:11:27 -0400 Subject: SERVER-47265 Disable tests from running in multi-version suites until backport of SERVER-32198 --- jstests/sharding/query/lookup_mongod_unaware.js | 25 +++++++++++++--------- ..._and_restarted_shards_agree_on_shard_version.js | 12 +++++------ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/jstests/sharding/query/lookup_mongod_unaware.js b/jstests/sharding/query/lookup_mongod_unaware.js index c7f201d58a9..290d074ee47 100644 --- a/jstests/sharding/query/lookup_mongod_unaware.js +++ b/jstests/sharding/query/lookup_mongod_unaware.js @@ -1,13 +1,18 @@ -// Tests the behavior of a $lookup when a shard contains incorrect routing information for the -// local and/or foreign collections. This includes when the shard thinks the collection is sharded -// when it's not, and likewise when it thinks the collection is unsharded but is actually sharded. -// -// We restart a mongod to cause it to forget that a collection was sharded. When restarted, we -// expect it to still have all the previous data. -// @tags: [ -// requires_persistence, -// need_fixing_for_46 -// ] +/** + * Tests the behavior of a $lookup when a shard contains incorrect routing information for the + * local and/or foreign collections. This includes when the shard thinks the collection is sharded + * when it's not, and likewise when it thinks the collection is unsharded but is actually sharded. + * + * We restart a mongod to cause it to forget that a collection was sharded. When restarted, we + * expect it to still have all the previous data. + * + * @tags: [ + * requires_fcv_46, + * requires_persistence, + * ] + * + * TODO (SERVER-47265): Remove the requires_fcv_46 flag + */ (function() { "use strict"; diff --git a/jstests/sharding/stale_mongos_and_restarted_shards_agree_on_shard_version.js b/jstests/sharding/stale_mongos_and_restarted_shards_agree_on_shard_version.js index 953ac20713f..b6b42d8b667 100644 --- a/jstests/sharding/stale_mongos_and_restarted_shards_agree_on_shard_version.js +++ b/jstests/sharding/stale_mongos_and_restarted_shards_agree_on_shard_version.js @@ -1,14 +1,14 @@ /** * Tests that after a restart of a shard, multi write operations, finds and aggregations still work - * as expected with a stale router - * - * This test requrires persistence because it asumes the shard will still have it's data after - * restarting + * as expected with a stale router. Requrires persistence because it asumes the shard will still + * have it's data after a restart. * * @tags: [ - * requires_fcv_46, - * requires_persistence, + * requires_fcv_46, + * requires_persistence, * ] + * + * TODO (SERVER-47265): Remove the requires_fcv_46 flag */ (function() { 'use strict'; -- cgit v1.2.1