SERVER-26513 listCollections output should include _id index spec as idIndexr3.4.0-rc1

1 files changed, 16 insertions, 3 deletions

diff --git a/jstests/multiVersion/libs/verify_collection_data.js b/jstests/multiVersion/libs/verify_collection_data.js
index eb7cb952286..ab96a1ef29c 100644
--- a/jstests/multiVersion/libs/verify_collection_data.js
+++ b/jstests/multiVersion/libs/verify_collection_data.js
@@ -65,7 +65,7 @@ createCollectionWithData = function(db, collectionName, dataGenerator) {
 
 // MongoDB 3.4 introduces new fields into the listCollections result document. This function
 // injects expected 3.4 values into a 3.2 document to allow for object comparison.
-// TODO: Remove this check post-3.4 release.
+// TODO SERVER-26676: Remove this check post-3.4 release.
 var injectExpected34FieldsIf32 = function(collectionInfo, dbVersion) {
     if (dbVersion.startsWith("3.2")) {
         return Object.extend({type: "collection", info: {readOnly: false}}, collectionInfo);
@@ -74,6 +74,18 @@ var injectExpected34FieldsIf32 = function(collectionInfo, dbVersion) {
     return collectionInfo;
 };
 
+// MongoDB 3.4 introduces a new field 'idIndex' into the listCollections result document. This
+// cannot be injected into the 3.2 listCollections result document because the full index spec is
+// not known. This function removes the 'idIndex' field to allow for object comparison.
+// TODO SERVER-26676: Remove this check post-3.4 release.
+var removeIdIndexField = function(collectionInfo) {
+    if (collectionInfo.hasOwnProperty("idIndex")) {
+        delete collectionInfo.idIndex;
+    }
+
+    return collectionInfo;
+};
+
 // Class to save the state of a collection and later compare the current state of a collection to
 // the saved state
 function CollectionDataValidator() {
@@ -127,8 +139,9 @@ function CollectionDataValidator() {
         // Get the metadata for this collection
         var newCollectionInfo = this.getCollectionInfo(collection);
 
-        let colInfo1 = injectExpected34FieldsIf32(_collectionInfo, _dbVersion);
-        let colInfo2 = injectExpected34FieldsIf32(newCollectionInfo, dbVersionForCollection);
+        let colInfo1 = removeIdIndexField(injectExpected34FieldsIf32(_collectionInfo, _dbVersion));
+        let colInfo2 = removeIdIndexField(
+            injectExpected34FieldsIf32(newCollectionInfo, dbVersionForCollection));
         assert.docEq(colInfo1, colInfo2, "collection metadata not equal");
 
         // Get the indexes for this collection