Update upstream source from tag 'upstream/6.0.10'debian/6.0.10-1

Update to upstream version '6.0.10'
with Debian dir 2d176fa254eee97b139f712fec5709641335a8c3

1 files changed, 3 insertions, 6 deletions

diff --git a/jstests/core/collmod_convert_index_uniqueness.js b/jstests/core/collmod_convert_index_uniqueness.js
index fc6588ae70c..559a5fed82c 100644
--- a/jstests/core/collmod_convert_index_uniqueness.js
+++ b/jstests/core/collmod_convert_index_uniqueness.js
@@ -5,7 +5,7 @@
  *  # Cannot implicitly shard accessed collections because of collection existing when none
  *  # expected.
  *  assumes_no_implicit_collection_creation_after_drop,  # common tag in collMod tests.
- *  requires_fcv_52,
+ *  requires_fcv_60,
  *  requires_non_retryable_commands, # common tag in collMod tests.
  *  # TODO(SERVER-61181): Fix validation errors under ephemeralForTest.
  *  incompatible_with_eft,
@@ -19,12 +19,9 @@
 (function() {
 'use strict';
 
-const collModIndexUniqueEnabled = assert
-                                      .commandWorked(db.getMongo().adminCommand(
-                                          {getParameter: 1, featureFlagCollModIndexUnique: 1}))
-                                      .featureFlagCollModIndexUnique.value;
+load("jstests/libs/feature_flag_util.js");
 
-if (!collModIndexUniqueEnabled) {
+if (!FeatureFlagUtil.isEnabled(db, "CollModIndexUnique")) {
     jsTestLog('Skipping test because the collMod unique index feature flag is disabled.');
     return;
 }