cleanup

Author: baileympearson

test/integration/client-side-encryption/client_side_encryption.prose.12.deadlock.test.ts

@@ -65,7 +65,11 @@ function deadlockTest(
         kmsProviders: { local: { key: LOCAL_KEY } },
         bypassAutoEncryption,
         keyVaultClient: useKeyVaultClient ? this.clientKeyVault : undefined,
-        extraOptions: getEncryptExtraOptions()
+        extraOptions: {
+          // ...getEncryptExtraOptions(),
+          mongocryptdBypassSpawn: true,
+          mongocryptdURI: 'mongodb://localhost:3000'
+        }
       },
       maxPoolSize
     };
@@ -106,10 +110,19 @@ describe('Connection Pool Deadlock Prevention', function () {
   beforeEach(async function () {
     const url: string = this.configuration.url();
 
-    this.clientTest = new CapturingMongoClient(url);
+    const options = process.env.ALPINE ? {
+      autoEncryption: {
+        extraOptions: {
+          mongocryptdBypassSpawn: true,
+          mongocryptdURI: 'mongodb://localhost:3000'
+        }
+      }
+    } : {};
+    this.clientTest = new CapturingMongoClient(url, options);
     this.clientKeyVault = new CapturingMongoClient(url, {
       monitorCommands: true,
-      maxPoolSize: 1
+      maxPoolSize: 1,
+      ...options
     });
 
     this.clientEncryption = undefined;
@@ -133,7 +146,6 @@ describe('Connection Pool Deadlock Prevention', function () {
       kmsProviders: { local: { key: LOCAL_KEY } },
       keyVaultNamespace: 'keyvault.datakeys',
       keyVaultClient: this.keyVaultClient,
-      extraOptions: getEncryptExtraOptions()
     });
 
     this.ciphertext = await this.clientEncryption.encrypt('string0', {

test/integration/client-side-encryption/client_side_encryption.prose.test.js

@@ -1113,6 +1113,12 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
       // configure with `client_encrypted` to use the schema `external/external-schema.json` for
       // `db.coll` by setting a schema map like `{"db.coll": <contents of external-schema.json }`
       beforeEach(async function () {
+        if (process.env.ALPINE) {
+          this.currentTest.skipReason =
+            'alpine tests cannot spawn mongocryptds or use the crypt_shared.';
+          this.skip();
+        }
+
         clientEncrypted = this.configuration.newClient(
           {},
           {

test/tools/runner/config.ts

@@ -292,7 +292,6 @@ export class TestConfiguration {
         mongocryptdBypassSpawn: true,
         mongocryptdURI: 'mongodb://localhost:3000'
       }
-      console.error('annotating');
     }
 
     const connectionString = url.format(urlOptions);

test/tools/unified-spec-runner/entities.ts

@@ -578,7 +578,6 @@ export class EntitiesMap<E = Entity> extends Map<string, E> {
         } else {
           uri = makeConnectionString(config.url({ useMultipleMongoses }), entity.client.uriOptions);
         }
-        console.error({ uri });
         const client = new UnifiedMongoClient(uri, entity.client);
         try {
           new EntityEventRegistry(client, entity.client, map).register();