From a69e9ece4d81a018bb0d670010412e42a76a40dd Mon Sep 17 00:00:00 2001
From: "Jeffrey A. Clark" <aclark@aclark.net>
Date: Wed, 11 Mar 2026 13:28:48 -0400
Subject: [PATCH] PYTHON-5754 Fix USE_ACTIVE_VENV support

- in run-tests.sh
- in 'just test' recipe
---
 .evergreen/scripts/setup_tests.py | 4 ++++
 justfile                          | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.evergreen/scripts/setup_tests.py b/.evergreen/scripts/setup_tests.py
index 009de9f1d1..e188dcaa9d 100644
--- a/.evergreen/scripts/setup_tests.py
+++ b/.evergreen/scripts/setup_tests.py
@@ -153,6 +153,10 @@ def handle_test_env() -> None:
     # Start compiling the args we'll pass to uv.
     UV_ARGS = ["--extra test --no-group dev"]
 
+    # If USE_ACTIVE_VENV is set, add --active to UV_ARGS so run-tests.sh uses the active venv.
+    if is_set("USE_ACTIVE_VENV"):
+        UV_ARGS.append("--active")
+
     test_title = test_name
     if sub_test_name:
         test_title += f" {sub_test_name}"
diff --git a/justfile b/justfile
index 82b1ac91dc..78f48c2c75 100644
--- a/justfile
+++ b/justfile
@@ -57,7 +57,9 @@ lint-manual *args="": && resync
 
 [group('test')]
 test *args="-v --durations=5 --maxfail=10": && resync
-    uv run --extra test python -m pytest {{args}}
+    #!/usr/bin/env bash
+    set -euo pipefail
+    uv run ${USE_ACTIVE_VENV:+--active} --extra test python -m pytest {{args}}
 
 [group('test')]
 test-numpy *args="": && resync