Fix test failures due to wrong merge

Author: alcaeus

.evergreen/run-tests.sh

@@ -12,7 +12,7 @@ AUTH=${AUTH:-noauth}
 SSL=${SSL:-nossl}
 MONGODB_URI=${MONGODB_URI:-}
 TESTS=${TESTS:-}
-IS_MATRIX_TESTING=${IS_MATRIX_TESTING:-false}
+IS_MATRIX_TESTING=${IS_MATRIX_TESTING:-}
 
 # For matrix testing, we have to determine the correct driver version
 if [ "$IS_MATRIX_TESTING" == "true" ]; then

tests/SpecTests/ClientSideEncryptionSpecTest.php

@@ -320,12 +320,14 @@ public function testExternalKeyVault($withExternalKeyVault)
         $client = $this->getContext()->getClient();
         $client->selectCollection('db', 'coll')->drop();
 
-        $keyId = $client
-            ->selectCollection('keyvault', 'datakeys')
-            ->insertOne(
-                $this->decodeJson(file_get_contents(__DIR__ . '/client-side-encryption/external/external-key.json')),
-                ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]
-            )
+        $keyVaultCollection = $client->selectCollection(
+            'keyvault',
+            'datakeys',
+            ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)] + $this->getContext()->defaultWriteOptions
+        );
+        $keyVaultCollection->drop();
+        $keyId = $keyVaultCollection
+            ->insertOne($this->decodeJson(file_get_contents(__DIR__ . '/client-side-encryption/external/external-key.json')))
             ->getInsertedId();
 
         $encryptionOpts = [
@@ -400,14 +402,15 @@ function () use ($collection) {
                     ]);
                 },
                 function ($command) use (&$commands) {
+                    if ($command['started']->getCommandName() !== 'insert') {
+                        return;
+                    }
+
                     $commands[] = $command;
                 }
             );
 
             $test->assertCount(2, $commands);
-            foreach ($commands as $command) {
-                $test->assertSame('insert', $command['started']->getCommandName());
-            }
         },
         ];
 
@@ -428,14 +431,15 @@ function () use ($collection, $document) {
                     ]);
                 },
                 function ($command) use (&$commands) {
+                    if ($command['started']->getCommandName() !== 'insert') {
+                        return;
+                    }
+
                     $commands[] = $command;
                 }
             );
 
             $test->assertCount(2, $commands);
-            foreach ($commands as $command) {
-                $test->assertSame('insert', $command['started']->getCommandName());
-            }
         },
         ];