SERVER-41696 Modify tests depending on the 'ns' field from index specs to no longer have a dependency on it

2 files changed, 8 insertions, 4 deletions

diff --git a/jstests/replsets/index_delete.js b/jstests/replsets/index_delete.js
index 5f64979dbc3..59486bb2932 100644
--- a/jstests/replsets/index_delete.js
+++ b/jstests/replsets/index_delete.js
@@ -105,7 +105,6 @@ master.getCollection('local.oplog.rs').find().forEach(function(entry) {
         assert(entry.o2.name);
         assert(entry.o2.key);
         assert.eq(entry.o2.v, 2);
-        assert.eq(entry.o2.ns, dbName + "." + collName);
         assert.eq(entry.ns, dbName + ".$cmd");
     }
 });
diff --git a/jstests/replsets/mr_nonrepl_coll_in_local_db.js b/jstests/replsets/mr_nonrepl_coll_in_local_db.js
index 8348b65e09a..a6d6cad7e7a 100644
--- a/jstests/replsets/mr_nonrepl_coll_in_local_db.js
+++ b/jstests/replsets/mr_nonrepl_coll_in_local_db.js
@@ -61,10 +61,15 @@ createdCollections.forEach(function(createdCollectionName) {
         return;
     }
 
+    const periodIndex = createdCollectionName.indexOf(".");
+    const dbName = createdCollectionName.substring(0, periodIndex);
+    const collName = createdCollectionName.substring(periodIndex + 1);
+
     // Search for a log entry for the creation of this collection.
-    const oplogEntries = primaryDB.getSiblingDB("local")["oplog.rs"]
-                             .find({op: "c", "o.idIndex.ns": createdCollectionName})
-                             .toArray();
+    const oplogEntries =
+        primaryDB.getSiblingDB("local")["oplog.rs"]
+            .find({op: "c", ns: dbName + ".$cmd", "o.create": collName, "o.idIndex.name": "_id_"})
+            .toArray();
     if (createdCollectionName.startsWith("local.")) {
         // We do not want to see any replication of "local" collections.
         assert.eq(oplogEntries.length,