fix tests

mongodb · Nov 25, 2024 · 50549f6 · 50549f6
1 parent e822c86
commit 50549f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -554,14 +554,6 @@ functions:
         args: [*task-runner, evg-test-kmip]
 
   start-kms-failpoint-server:
-    - command: subprocess.exec
-      params:
-        working_dir: src/go.mongodb.org/mongo-driver
-        binary: bash
-        background: true
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "DRIVERS_TOOLS"]
-        # This cannot use task because it will hang on Windows.
-        args: [etc/setup-encryption.sh]
     - command: subprocess.exec
       params:
         binary: python3
@@ -577,8 +569,8 @@ functions:
         binary: "bash"
         env: 
           GO_BUILD_TAGS: cse
-        include_expansions_in_env: [AUTH, SSL, MONGODB_URI, TOPOLOGY, 
-          MONGO_GO_DRIVER_COMPRESSOR]
+        include_expansions_in_env: [AUTH, SSL, MONGODB_URI, TOPOLOGY, MONGO_GO_DRIVER_COMPRESSOR,
+          "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "DRIVERS_TOOLS"]
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
@@ -1531,10 +1523,6 @@ tasks:
           SSL: "nossl"
       - func: start-kms-failpoint-server
       - func: run-retry-kms-requests
-        vars:
-          TOPOLOGY: "server"
-          AUTH: "noauth"
-          SSL: "nossl"
 
   - name: "test-serverless"
     tags: ["serverless"]

diff --git a/internal/integration/client_side_encryption_prose_test.go b/internal/integration/client_side_encryption_prose_test.go
@@ -1516,8 +1516,8 @@ func TestClientSideEncryptionProse(t *testing.T) {
 		tlsConfig := make(map[string]*tls.Config)
 		if tlsCAFileKMIP != "" && tlsClientCertificateKeyFileKMIP != "" {
 			clientAndCATlsMap := map[string]interface{}{
-				// "tlsCertificateKeyFile": tlsClientCertificateKeyFileKMIP,
-				"tlsCAFile": tlsCAFileKMIP,
+				"tlsCertificateKeyFile": tlsClientCertificateKeyFileKMIP,
+				"tlsCAFile":             tlsCAFileKMIP,
 			}
 			certConfig, err := options.BuildTLSConfig(clientAndCATlsMap)
 			assert.Nil(mt, err, "BuildTLSConfig error: %v", err)