SERVER-32463 Remove / modify FCV dependent sharding UUID tests

1 files changed, 6 insertions, 28 deletions

diff --git a/jstests/sharding/uuid_propagated_to_config_server_on_shardCollection.js b/jstests/sharding/uuid_propagated_to_config_server_on_shardCollection.js
index d8dffb2f455..fb610a68925 100644
--- a/jstests/sharding/uuid_propagated_to_config_server_on_shardCollection.js
+++ b/jstests/sharding/uuid_propagated_to_config_server_on_shardCollection.js
@@ -1,13 +1,11 @@
 /**
- * 1) Tests that in fcv=3.4, the shardCollection command does not persist a UUID in
- * config.collections.
- *
- * 2) Tests that in fcv=3.6, the shardCollection command obtains the collection's UUID from the
- * primary shard and persists it in config.collections.
+ * Tests that the shardCollection command obtains the collection's UUID from the primary shard and
+ * persists it in config.collections.
  */
 (function() {
+    "use strict";
 
-    load('jstests/libs/uuid_util.js');
+    load("jstests/libs/uuid_util.js");
 
     let db = "test";
 
@@ -16,29 +14,8 @@
     assert.commandWorked(st.s.adminCommand({enableSharding: db}));
     st.ensurePrimaryShard(db, st.shard0.shardName);
 
-    // Check that in fcv=3.4, shardCollection does not persist a UUID.
-    assert.commandWorked(st.s.adminCommand({setFeatureCompatibilityVersion: "3.4"}));
+    // Check that shardCollection propagates and persists UUIDs.
     for (let i = 0; i < 3; i++) {
-        let coll = "foo" + i;
-        let nss = db + "." + coll;
-
-        // It shouldn't matter whether the collection existed on the shard already or not; test
-        // both cases.
-        if (i === 0) {
-            assert.writeOK(st.s.getDB(db).getCollection(coll).insert({x: 1}));
-        }
-
-        assert.commandWorked(st.s.adminCommand({shardCollection: nss, key: {_id: 1}}));
-
-        // Check that the entry in config.collections does not have a uuid field.
-        assert.eq(undefined, getUUIDFromConfigCollections(st.s, nss));
-    }
-
-    // Check that in fcv=3.6, shardCollection propagates and persists UUIDs.
-    assert.commandWorked(st.s.adminCommand({setFeatureCompatibilityVersion: "3.6"}));
-    for (let i = 0; i < 3; i++) {
-        // Use different collection names because the ones starting with 'foo' are already sharded
-        // and will have a UUID generated for them on setFCV=3.6.
         let coll = "bar" + i;
         let nss = db + "." + coll;
 
@@ -60,4 +37,5 @@
         assert.eq(listCollsUUID, collEntryUUID);
     }
 
+    st.stop();
 })();