fix load balancer test

Author: blink1073

.evergreen/run-tests.sh

@@ -29,7 +29,7 @@ if [ -f "./secrets-export.sh" ]; then
   . "./secrets-export.sh"
 fi
 
-# List the packages
+# List the packages.
 PIP_QUIET=0 uv run ${UV_ARGS} --with pip pip list
 
 # Start the test runner.

.evergreen/scripts/run_tests.py

@@ -23,8 +23,29 @@
 LOGGER = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO, format="%(levelname)-8s %(message)s")
 
-# Handle green frameworks first so they can patch modules.
-if GREEN_FRAMEWORK:
+
+def handle_perf(start_time: datetime, end_time: datetime):
+    elapsed_secs = (end_time - start_time).total_seconds()
+    with open("results.json") as fid:
+        results = json.load(fid)
+    LOGGER.info("results.json:\n%s", json.dumps(results, indent=2))
+
+    results = dict(
+        status="pass",
+        exit_code=0,
+        test_file="BenchMarkTests",
+        start=int(start_time.timestamp()),
+        end=int(end_time.timestamp()),
+        elapsed=elapsed_secs,
+    )
+    report = dict(failures=0, results=results)
+    LOGGER.info("report.json\n%s", json.dumps(report, indent=2))
+
+    with open("report.json", "w", newline="\n") as fid:
+        json.dump(report, fid)
+
+
+def handle_green_framework() -> None:
     if GREEN_FRAMEWORK == "eventlet":
         import eventlet
 
@@ -46,52 +67,44 @@
 
     LOGGER.info(f"Running tests with {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()
+def run() -> None:
+    # Handle green frameworks first so they can patch modules.
+    if GREEN_FRAMEWORK:
+        handle_green_framework()
 
-if os.environ.get("PYMONGOCRYPT_LIB"):
-    # Ensure pymongocrypt is working properly.
-    import pymongocrypt
+    # 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
 
-    LOGGER.info(f"pymongocrypt version: {pymongocrypt.__version__})")
-    LOGGER.info(f"libmongocrypt version: {pymongocrypt.libmongocrypt_version()})")
+        fail_if_no_c()
 
-LOGGER.info(f"Test setup:\n{AUTH=}\n{SSL=}\n{UV_ARGS=}\n{TEST_ARGS=}")
+    if os.environ.get("PYMONGOCRYPT_LIB"):
+        # Ensure pymongocrypt is working properly.
+        import pymongocrypt
 
-# Record the start time for a perf test.
-if TEST_PERF:
-    start_time = datetime.now()
+        LOGGER.info(f"pymongocrypt version: {pymongocrypt.__version__})")
+        LOGGER.info(f"libmongocrypt version: {pymongocrypt.libmongocrypt_version()})")
 
-# Run the tests.
-pytest.main(TEST_ARGS)
+    LOGGER.info(f"Test setup:\n{AUTH=}\n{SSL=}\n{UV_ARGS=}\n{TEST_ARGS=}")
 
-# Handle perf test post actions.
-if TEST_PERF:
-    end_time = datetime.now()
-    elapsed_secs = (end_time - start_time).total_seconds()
-    with open("results.json") as fid:
-        results = json.load(fid)
-    LOGGER.info("results.json:\n%s", json.dumps(results, indent=2))
+    # Record the start time for a perf test.
+    if TEST_PERF:
+        start_time = datetime.now()
 
-    results = dict(
-        status="pass",
-        exit_code=0,
-        test_file="BenchMarkTests",
-        start=int(start_time.timestamp()),
-        end=int(end_time.timestamp()),
-        elapsed=elapsed_secs,
-    )
-    report = dict(failures=0, results=results)
-    LOGGER.info("report.json\n%s", json.dumps(report, indent=2))
+    # Run the tests.
+    pytest.main(TEST_ARGS)
 
-    with open("report.json", "w", newline="\n") as fid:
-        json.dump(report, fid)
+    # Handle perf test post actions.
+    if TEST_PERF:
+        end_time = datetime.now()
+        handle_perf(start_time, end_time)
+
+    # Handle coverage post actions.
+    if os.environ.get("COVERAGE"):
+        shutil.rmtree(".pytest_cache", ignore_errors=True)
 
 
-# Handle coverage post actions.
-if os.environ.get("COVERAGE"):
-    shutil.rmtree(".pytest_cache", ignore_errors=True)
+if __name__ == "__main__":
+    run()

.evergreen/scripts/setup_tests.py

@@ -228,9 +228,9 @@ def handle_test_env() -> None:
 
     write_env("AUTH", AUTH)
     write_env("SSL", SSL)
-    write_env("PIP_QUIET")  # Quiet by default
-    write_env("PIP_PREFER_BINARY")  # Prefer binary dists by default
-    write_env("UV_FROZEN")  # Do not modify lock files
+    write_env("PIP_QUIET")  # Quiet by default.
+    write_env("PIP_PREFER_BINARY")  # Prefer binary dists by default.
+    write_env("UV_FROZEN")  # Do not modify lock files.
 
     # Skip CSOT tests on non-linux platforms.
     if PLATFORM != "linux":

test/asynchronous/helpers.py

@@ -81,7 +81,7 @@
 
 COMPRESSORS = os.environ.get("COMPRESSORS")
 MONGODB_API_VERSION = os.environ.get("MONGODB_API_VERSION")
-TEST_LOADBALANCER = bool(os.environ.get("TEST_LOADBALANCER"))
+TEST_LOADBALANCER = bool(os.environ.get("TEST_LOAD_BALANCER"))
 TEST_SERVERLESS = bool(os.environ.get("TEST_SERVERLESS"))
 SINGLE_MONGOS_LB_URI = os.environ.get("SINGLE_MONGOS_LB_URI")
 MULTI_MONGOS_LB_URI = os.environ.get("MULTI_MONGOS_LB_URI")

test/helpers.py

@@ -81,7 +81,7 @@
 
 COMPRESSORS = os.environ.get("COMPRESSORS")
 MONGODB_API_VERSION = os.environ.get("MONGODB_API_VERSION")
-TEST_LOADBALANCER = bool(os.environ.get("TEST_LOADBALANCER"))
+TEST_LOADBALANCER = bool(os.environ.get("TEST_LOAD_BALANCER"))
 TEST_SERVERLESS = bool(os.environ.get("TEST_SERVERLESS"))
 SINGLE_MONGOS_LB_URI = os.environ.get("SINGLE_MONGOS_LB_URI")
 MULTI_MONGOS_LB_URI = os.environ.get("MULTI_MONGOS_LB_URI")