SERVER-48182 Enable tests dependent on the backport of SERVER-46679 to run in multi-version suites

8 files changed, 49 insertions, 53 deletions

diff --git a/jstests/sharding/hash_shard_unique_compound.js b/jstests/sharding/hash_shard_unique_compound.js
index 1b069a94181..460d28789b9 100644
--- a/jstests/sharding/hash_shard_unique_compound.js
+++ b/jstests/sharding/hash_shard_unique_compound.js
@@ -1,14 +1,9 @@
-// Basic test of sharding with a hashed shard key and other unique index
-// Does 2 things and checks for consistent error:
-//  1.) shard collection on hashed "a", ensure unique index {a:1, b:1}
-//  2.) reverse order
-
-// This test triggers a compiler bug that causes a crash when compiling with optimizations on, see
-// SERVER-36321.
-// @tags: [
-//   blacklist_from_rhel_67_s390x,
-//   need_fixing_for_46
-// ]
+/**
+ * Basic test of sharding with a hashed shard key and other unique index. Does 2 things and checks
+ * for consistent error:
+ * 1. shard collection on hashed "a", ensure unique index {a:1, b:1}
+ * 2. reverse order
+ */
 (function() {
 'use strict';
 
diff --git a/jstests/sharding/move_chunk_critical_section_non_internal_client_abort.js b/jstests/sharding/move_chunk_critical_section_non_internal_client_abort.js
index addc7005bca..463d7493316 100644
--- a/jstests/sharding/move_chunk_critical_section_non_internal_client_abort.js
+++ b/jstests/sharding/move_chunk_critical_section_non_internal_client_abort.js
@@ -2,7 +2,9 @@
  * Tests that a moveChunk operation is properly aborted when an index command is received from a
  * non-internal client while in the critical section.
  *
- * @tags: [need_fixing_for_46]
+ * @tags [
+ *  requires_fcv_46,
+ * ]
  */
 (function() {
 "use strict";
diff --git a/jstests/sharding/retryable_write_error_labels.js b/jstests/sharding/retryable_write_error_labels.js
index 89e2ca5645f..05027284f3d 100644
--- a/jstests/sharding/retryable_write_error_labels.js
+++ b/jstests/sharding/retryable_write_error_labels.js
@@ -7,10 +7,8 @@
  * @tags: [
  *   requires_find_command,
  *   uses_transactions,
- *   need_fixing_for_46
  * ]
  */
-
 (function() {
 "use strict";
 
diff --git a/jstests/sharding/transactions_multi_writes.js b/jstests/sharding/transactions_multi_writes.js
index fd2b6139ed4..01ef40cf83f 100644
--- a/jstests/sharding/transactions_multi_writes.js
+++ b/jstests/sharding/transactions_multi_writes.js
@@ -1,12 +1,13 @@
-// Verifies multi-writes in transactions are sent with shard versions to only the targeted shards.
-//
-// @tags: [
-//   requires_find_command,
-//   requires_sharding,
-//   uses_multi_shard_transaction,
-//   uses_transactions,
-//   need_fixing_for_46
-// ]
+/**
+ * Verifies multi-writes in transactions are sent with shard versions to only the targeted shards.
+ *
+ * @tags: [
+ *  requires_find_command,
+ *  requires_sharding,
+ *  uses_multi_shard_transaction,
+ *  uses_transactions,
+ * ]
+ */
 (function() {
 "use strict";
 
diff --git a/jstests/sharding/transactions_view_resolution.js b/jstests/sharding/transactions_view_resolution.js
index ea258c5f705..0b3276e5475 100644
--- a/jstests/sharding/transactions_view_resolution.js
+++ b/jstests/sharding/transactions_view_resolution.js
@@ -1,12 +1,13 @@
-// Tests mongos behavior when reading against views in a transaction.
-//
-// @tags: [
-//   requires_find_command,
-//   requires_sharding,
-//   uses_multi_shard_transaction,
-//   uses_transactions,
-//   need_fixing_for_46
-// ]
+/**
+ * Tests mongos behavior when reading against views in a transaction.
+ *
+ * @tags: [
+ *  requires_find_command,
+ *  requires_sharding,
+ *  uses_multi_shard_transaction,
+ *  uses_transactions,
+ * ]
+ */
 (function() {
 "use strict";
 
diff --git a/jstests/sharding/update_compound_shard_key.js b/jstests/sharding/update_compound_shard_key.js
index a534451ae9e..4bfdb4c6cac 100644
--- a/jstests/sharding/update_compound_shard_key.js
+++ b/jstests/sharding/update_compound_shard_key.js
@@ -5,10 +5,9 @@
  * sessionDB.coll.find() will throw "Cannot run a legacy query on a session".
  *
  * @tags: [
- *   requires_find_command,
- *   uses_multi_shard_transaction,
- *   uses_transactions,
- *   need_fixing_for_46
+ *  requires_find_command,
+ *  uses_multi_shard_transaction,
+ *  uses_transactions,
  * ]
  */
 (function() {
diff --git a/jstests/sharding/update_shard_key_conflicting_writes.js b/jstests/sharding/update_shard_key_conflicting_writes.js
index c654c26e4f6..b3dfcd3ac05 100644
--- a/jstests/sharding/update_shard_key_conflicting_writes.js
+++ b/jstests/sharding/update_shard_key_conflicting_writes.js
@@ -6,10 +6,9 @@
  * sessionDB.coll.find() will throw "Cannot run a legacy query on a session".
  *
  * @tags: [
- *   requires_find_command,
- *   uses_transactions,
- *   uses_multi_shard_transaction,
- *   need_fixing_for_46
+ *  requires_find_command,
+ *  uses_multi_shard_transaction,
+ *  uses_transactions,
  * ]
  */
 
diff --git a/jstests/sharding/update_sharded.js b/jstests/sharding/update_sharded.js
index 1b96744c260..ed4bdc1b406 100644
--- a/jstests/sharding/update_sharded.js
+++ b/jstests/sharding/update_sharded.js
@@ -1,16 +1,17 @@
-// Test simple updates issued through mongos. Updates have different constraints through mongos,
-// since shard key is immutable.
-//
-// Updating a shard key in a single statement may use a multi shard transaction.
-// Use the 'requires_find_command' tag to skip this test in sharding_op_query suite.
-// Otherwise, sessionDb.coll.find() will throw "Cannot run a legacy query on a session".
-//
-// @tags: [
-//   requires_find_command,
-//   uses_multi_shard_transaction,
-//   uses_transactions,
-//   need_fixing_for_46
-// ]
+/**
+ * Test simple updates issued through mongos. Updates have different constraints through mongos,
+ * since shard key is immutable.
+ *
+ * Updating a shard key in a single statement may use a multi shard transaction. Uses the
+ * 'requires_find_command' tag to skip this test in sharding_op_query suite. Otherwise,
+ * sessionDb.coll.find() will throw "Cannot run a legacy query on a session".
+ *
+ * @tags: [
+ *  requires_find_command,
+ *  uses_multi_shard_transaction,
+ *  uses_transactions,
+ * ]
+ */
 (function() {
 
 load("jstests/sharding/libs/sharded_transactions_helpers.js");