From 588bc724c3b2afeec5ce837d9a1d4cc3c52e69c9 Mon Sep 17 00:00:00 2001
From: Matt Dale <9760375+matthewdale@users.noreply.github.com>
Date: Tue, 5 Nov 2024 11:04:13 -0800
Subject: [PATCH] Fix missing workload executor expansions in test runner
 function. (#223)

---
 .evergreen/config.yml                         | 2 +-
 integrations/python/pymongo/install-driver.sh | 2 ++
 integrations/python/pymongo/workload-executor | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index ed9ad8ba..d34b5733 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -222,7 +222,7 @@ functions:
           ATLAS_ADMIN_API_USERNAME: ${atlas_admin_api_username}
           ATLAS_ADMIN_API_PASSWORD: ${atlas_admin_api_password}
           CLUSTER_NAME_SALT: ${build_id}
-        include_expansions_in_env: [DRIVER_DIRNAME]
+        include_expansions_in_env: [DRIVER_DIRNAME, PYTHON_BIN_DIR, ASYNC, FRAMEWORK, JAVA_HOME]
         script: |
           source secrets-export.sh
           astrolabevenv/${PYTHON_BIN_DIR}/astrolabe atlas-tests \
diff --git a/integrations/python/pymongo/install-driver.sh b/integrations/python/pymongo/install-driver.sh
index c885db84..6d81e2b7 100755
--- a/integrations/python/pymongo/install-driver.sh
+++ b/integrations/python/pymongo/install-driver.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -o xtrace
 
+PYMONGO_VIRTUALENV_NAME=${PYMONGO_VIRTUALENV_NAME:-pymongotestvenv}
+
 "$PYTHON_BINARY" --version
 "$PYTHON_BINARY" -m virtualenv "$PYMONGO_VIRTUALENV_NAME"
 "$PYMONGO_VIRTUALENV_NAME/$PYTHON_BIN_DIR/pip" install -e mongo-python-driver
diff --git a/integrations/python/pymongo/workload-executor b/integrations/python/pymongo/workload-executor
index 74d46a7c..d18eaab7 100755
--- a/integrations/python/pymongo/workload-executor
+++ b/integrations/python/pymongo/workload-executor
@@ -2,4 +2,6 @@
 
 set -o errexit
 
+PYMONGO_VIRTUALENV_NAME=${PYMONGO_VIRTUALENV_NAME:-pymongotestvenv}
+
 "$PYMONGO_VIRTUALENV_NAME/$PYTHON_BIN_DIR/python" "integrations/$DRIVER_DIRNAME/workload-executor.py" "$1" "$2"