cleanup

Author: isabelatkinson

.evergreen/build-and-upload-gcp-kms-test.sh

@@ -1307,11 +1307,9 @@ tasks:
 
   - name: "test-gcp-kms"
     commands:
-      - func: "build csfle expansions"
       - func: "build and upload gcp kms test"
       - func: "run gcp kms test"
 
-
   - name: test-ocsp-rsa-valid-cert-server-staples
     tags: ["ocsp", "ocsp-rsa", "ocsp-staple"]
     commands:
@@ -1916,10 +1914,12 @@ task_groups:
           shell: "bash"
           script: |
             ${PREPARE_SHELL}
+            set +o xtrace
             echo '${testgcpkms_key_file}' > /tmp/testgcpkms_key_file.json
             export GCPKMS_KEYFILE=/tmp/testgcpkms_key_file.json
             export GCPKMS_DRIVERS_TOOLS=$DRIVERS_TOOLS
             export GCPKMS_SERVICEACCOUNT="${testgcpkms_service_account}"
+            set -o xtrace
             $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/create-and-setup-instance.sh
       - command: expansions.update
         params:
@@ -1930,16 +1930,16 @@ task_groups:
           shell: "bash"
           script: |
             ${PREPARE_SHELL}
+            set +o xtrace
             export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
             export GCPKMS_PROJECT=${GCPKMS_PROJECT}
             export GCPKMS_ZONE=${GCPKMS_ZONE}
             export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
+            set -o xtrace
             $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/delete-instance.sh
     tasks:
       - test-gcp-kms
 
-
-
 buildvariants:
 -
   matrix_name: "tests"

.evergreen/config.yml

@@ -118,14 +118,12 @@ async fn valid_pass() {
 #[cfg_attr(feature = "tokio-runtime", tokio::test(flavor = "multi_thread"))]
 #[cfg_attr(feature = "async-std-runtime", async_std::test)]
 async fn valid_fail() {
-    let _guard: RwLockWriteGuard<_> = LOCK.run_exclusively().await;
     expect_failures(&["unified-test-format", "valid-fail"]).await;
 }
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test(flavor = "multi_thread"))]
 #[cfg_attr(feature = "async-std-runtime", async_std::test)]
 async fn invalid() {
-    let _guard: RwLockWriteGuard<_> = LOCK.run_exclusively().await;
     expect_failures(&["unified-test-format", "invalid"]).await;
 }