clean up tasks

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -790,7 +790,7 @@ tasks:
     commands:
       - func: run server
         vars:
-          TOPOLOGY: replica-set
+          TOPOLOGY: replica_set
       - func: run tests
         vars:
           TEST_NAME: mod_wsgi
@@ -810,7 +810,7 @@ tasks:
     commands:
       - func: run server
         vars:
-          TOPOLOGY: replica-set
+          TOPOLOGY: replica_set
       - func: run tests
         vars:
           TEST_NAME: mod_wsgi

.evergreen/scripts/generate_config.py

@@ -889,12 +889,12 @@ def create_oidc_tasks():
 
 def create_mod_wsgi_tasks():
     tasks = []
-    for test, topology in product(["standalone", "embedded-mode"], ["standalone", "replica-set"]):
+    for test, topology in product(["standalone", "embedded-mode"], ["standalone", "replica_set"]):
         if test == "standalone":
             task_name = "mod-wsgi-"
         else:
             task_name = "mod-wsgi-embedded-mode-"
-        task_name += topology
+        task_name += topology.replace("_", "-")
         server_vars = dict(TOPOLOGY=topology)
         server_func = FunctionCall(func="run server", vars=server_vars)
         vars = dict(TEST_NAME="mod_wsgi", SUB_TEST_NAME=test)

.evergreen/scripts/utils.py

@@ -52,6 +52,8 @@ class Distro:
 # Tests that require a sub test suite.
 SUB_TEST_REQUIRED = ["auth_aws", "auth_oidc", "kms", "mod_wsgi"]
 
+EXTRA_TESTS = ["mod_wsgi"]
+
 
 def get_test_options(
     description, require_sub_test_name=True, allow_extra_opts=False
@@ -62,7 +64,7 @@ def get_test_options(
     if require_sub_test_name:
         parser.add_argument(
             "test_name",
-            choices=sorted(TEST_SUITE_MAP),
+            choices=sorted(TEST_SUITE_MAP + EXTRA_TESTS),
             nargs="?",
             default="default",
             help="The optional name of the test suite to set up, typically the same name as a pytest marker.",