cleanup

Author: blink1073

.evergreen/scripts/configure-env.sh

@@ -76,7 +76,7 @@ EOT
 
 # Write the .env file for drivers-tools.
 rm -rf $DRIVERS_TOOLS
-git clone --branch revert-574-ironage/TUNE-74 https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
+git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
 
 cat <<EOT > ${DRIVERS_TOOLS}/.env
 SKIP_LEGACY_SHELL=1

.evergreen/scripts/run_tests.py

@@ -24,7 +24,8 @@
 logging.basicConfig(level=logging.INFO, format="%(levelname)-8s %(message)s")
 
 
-def handle_perf(start_time: datetime, end_time: datetime):
+def handle_perf(start_time: datetime):
+    end_time = datetime.now()
     elapsed_secs = (end_time - start_time).total_seconds()
     with open("results.json") as fid:
         results = json.load(fid)
@@ -68,24 +69,33 @@ def handle_green_framework() -> None:
     LOGGER.info(f"Running tests with {GREEN_FRAMEWORK}...")
 
 
+def handle_c_ext() -> None:
+    if platform.python_implementation() != "CPython":
+        return
+    sys.path.insert(0, str(ROOT / "tools"))
+    from fail_if_no_c import main as fail_if_no_c
+
+    fail_if_no_c()
+
+
+def handle_pymongocrypt() -> None:
+    import pymongocrypt
+
+    LOGGER.info(f"pymongocrypt version: {pymongocrypt.__version__})")
+    LOGGER.info(f"libmongocrypt version: {pymongocrypt.libmongocrypt_version()})")
+
+
 def run() -> None:
-    # Handle green frameworks first so they can patch modules.
+    # Handle green framework first so they can patch modules.
     if GREEN_FRAMEWORK:
         handle_green_framework()
 
     # Ensure C extensions if applicable.
-    if not os.environ.get("NO_EXT") and platform.python_implementation() == "CPython":
-        sys.path.insert(0, str(ROOT / "tools"))
-        from fail_if_no_c import main as fail_if_no_c
-
-        fail_if_no_c()
+    if not os.environ.get("NO_EXT"):
+        handle_c_ext()
 
     if os.environ.get("PYMONGOCRYPT_LIB"):
-        # Ensure pymongocrypt is working properly.
-        import pymongocrypt
-
-        LOGGER.info(f"pymongocrypt version: {pymongocrypt.__version__})")
-        LOGGER.info(f"libmongocrypt version: {pymongocrypt.libmongocrypt_version()})")
+        handle_pymongocrypt()
 
     LOGGER.info(f"Test setup:\n{AUTH=}\n{SSL=}\n{UV_ARGS=}\n{TEST_ARGS=}")
 
@@ -98,8 +108,7 @@ def run() -> None:
 
     # Handle perf test post actions.
     if TEST_PERF:
-        end_time = datetime.now()
-        handle_perf(start_time, end_time)
+        handle_perf(start_time)
 
     # Handle coverage post actions.
     if os.environ.get("COVERAGE"):

.evergreen/scripts/teardown-tests.sh

@@ -24,6 +24,6 @@ if [ -n "${TEST_ENCRYPTION:-}" ]; then
 fi
 
 # Shut down load balancer if applicable.
-if [ -n "${TEST_LOADBALANCER:-}" ]; then
+if [ -n "${TEST_LOAD_BALANCER:-}" ]; then
     bash "${DRIVERS_TOOLS}"/.evergreen/run-load-balancer.sh stop
 fi