fix kms_setup

Author: blink1073

.evergreen/scripts/kms_tester.py

@@ -19,7 +19,7 @@ def _setup_azure_vm(base_env: dict[str, str]) -> None:
     env["AZUREKMS_CMD"] = "tar xf mongo-python-driver.tgz"
     run_command(f"{CSFLE_FOLDER}/azurekms/run-command.sh", env=env)
 
-    env["AZUREKMS_CMD"] = "bash .evergreen/just.sh setup-test kms azure-remote"
+    env["AZUREKMS_CMD"] = "bash .evergreen/just.sh setup-tests kms azure-remote"
     run_command(f"{CSFLE_FOLDER}/azurekms/run-command.sh", env=env)
     LOGGER.info("Setting up Azure VM... done.")
 
@@ -35,7 +35,7 @@ def _setup_gcp_vm(base_env: dict[str, str]) -> None:
     env["GCPKMS_CMD"] = "tar xf mongo-python-driver.tgz"
     run_command(f"{CSFLE_FOLDER}/gcpkms/run-command.sh", env=env)
 
-    env["GCPKMS_CMD"] = "bash ./.evergreen/just.sh setup-test kms gcp-remote"
+    env["GCPKMS_CMD"] = "bash ./.evergreen/just.sh setup-tests kms gcp-remote"
     run_command(f"{CSFLE_FOLDER}/gcpkms/run-command.sh", env=env)
     LOGGER.info("Setting up GCP VM...")
 

.evergreen/scripts/setup_tests.py

@@ -40,7 +40,7 @@
     "encryption": "encryption",
     "enterprise_auth": "auth",
     "index_management": "index_management",
-    "kms": "csfle",
+    "kms": "kms",
     "load_balancer": "load_balancer",
     "mockupdb": "mockupdb",
     "pyopenssl": "",
@@ -77,8 +77,14 @@ def get_options():
     parser = argparse.ArgumentParser(
         description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
     )
-    parser.add_argument("test_name", choices=sorted(TEST_SUITE_MAP), nargs="?", default="default")
-    parser.add_argument("sub_test_name", nargs="?")
+    parser.add_argument(
+        "test_name",
+        choices=sorted(TEST_SUITE_MAP),
+        nargs="?",
+        default="default",
+        help="The name of the test suite to set up, typically the same name as a pytest marker.",
+    )
+    parser.add_argument("sub_test_name", nargs="?", help="The sub test name, for example 'azure'")
     parser.add_argument(
         "--verbose", "-v", action="store_true", help="Whether to log at the DEBUG level"
     )

.evergreen/scripts/teardown-tests.sh

@@ -20,7 +20,7 @@ if [ -f $SCRIPT_DIR/test-env.sh ]; then
   echo "Sourcing test inputs"
   . $SCRIPT_DIR/test-env.sh
 else
-  echo "Missing test inputs, please run 'just setup-test'"
+  echo "Missing test inputs, please run 'just setup-tests'"
 fi
 
 # Start the test runner.

test/asynchronous/test_on_demand_csfle.py

@@ -34,7 +34,7 @@
 
 _IS_SYNC = False
 
-pytestmark = pytest.mark.csfle
+pytestmark = pytest.mark.kms
 
 
 class TestonDemandGCPCredentials(AsyncIntegrationTest):

test/test_on_demand_csfle.py

@@ -34,7 +34,7 @@
 
 _IS_SYNC = True
 
-pytestmark = pytest.mark.csfle
+pytestmark = pytest.mark.kms
 
 
 class TestonDemandGCPCredentials(IntegrationTest):