Merge branch 'master' into jenniferpeshansky/SERVER-70854jenniferpeshansky/SERVER-70854

1 files changed, 7 insertions, 3 deletions

diff --git a/jstests/core/arrayfind8.js b/jstests/core/arrayfind8.js
index 87a3a8d701a..087410efab2 100644
--- a/jstests/core/arrayfind8.js
+++ b/jstests/core/arrayfind8.js
@@ -5,8 +5,9 @@
 (function() {
 "use strict";
 
-const coll = db.jstests_arrayfind8;
-coll.drop();
+const collNamePrefix = 'jstests_arrayfind8_';
+let collCount = 0;
+let coll;
 
 // May be changed during the test.
 let currentIndexSpec = {a: 1};
@@ -55,6 +56,8 @@ function checkMatch(bothMatch, elemMatch, nonElemMatch, standardQuery, elemMatch
  * @param additionalConstraints - additional query parameters not generated from @param subQuery
  */
 function checkQuery(subQuery, bothMatch, elemMatch, nonElemMatch, additionalConstraints) {
+    const collNameSuffix = collCount++;
+    coll = db.getCollection(collNamePrefix + 'noindex_' + collNameSuffix);
     coll.drop();
     additionalConstraints = additionalConstraints || {};
 
@@ -86,7 +89,8 @@ function checkQuery(subQuery, bothMatch, elemMatch, nonElemMatch, additionalCons
 
     // Check matching and index bounds for a single key index.
 
-    assert.eq(coll.drop(), true);
+    coll = db.getCollection(collNamePrefix + 'index_' + collNameSuffix);
+    coll.drop();
     insertValueIfNotNull(bothMatch);
     insertValueIfNotNull(elemMatch);
     // The nonElemMatch document is not tested here, as it will often make the index multikey.