cleanup

Author: blink1073

.evergreen/run-tests.sh

@@ -21,13 +21,17 @@ if [ -f $SCRIPT_DIR/scripts/test-env.sh ]; then
   . $SCRIPT_DIR/scripts/test-env.sh
 else
   echo "Missing test inputs, please run 'just setup-test'"
+  exit 1
 fi
 
 # Source the local secrets export file if available.
 if [ -f "./secrets-export.sh" ]; then
   . "./secrets-export.sh"
 fi
 
+# List the packages
+PIP_QUIET=0 uv run ${UV_ARGS} --with pip pip list
+
 # Start the test runner.
 uv run ${UV_ARGS} .evergreen/scripts/run_tests.py
 

.evergreen/scripts/run_tests.py

@@ -4,9 +4,7 @@
 import logging
 import os
 import platform
-import shlex
 import shutil
-import subprocess
 import sys
 from datetime import datetime
 from pathlib import Path
@@ -62,12 +60,6 @@
     LOGGER.info(f"pymongocrypt version: {pymongocrypt.__version__})")
     LOGGER.info(f"libmongocrypt version: {pymongocrypt.libmongocrypt_version()})")
 
-# Show the installed packages.  Pip can only be run as a cli.
-env = os.environ.copy()
-env["PIP_QUIET"] = "0"
-LOGGER.info("Installed packages:")
-subprocess.run(shlex.split(f"uv run {UV_ARGS} --with pip pip list"), env=env, check=True)  # noqa: S603
-
 LOGGER.info(f"Test setup:\n{AUTH=}\n{SSL=}\n{UV_ARGS=}\n{TEST_ARGS=}")
 
 # Record the start time for a perf test.
@@ -82,7 +74,8 @@
     end_time = datetime.now()
     elapsed_secs = (end_time - start_time).total_seconds()
     with open("results.json") as fid:
-        LOGGER.info("results.json:\n%s", json.dump(fid, indent=2))
+        results = json.load(fid)
+    LOGGER.info("results.json:\n%s", json.dumps(results, indent=2))
 
     results = dict(
         status="pass",