fix tests

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -804,7 +804,7 @@ tasks:
       - func: run tests
         vars:
           TEST_NAME: mod_wsgi
-          SUB_TEST_NAME: embedded-mode
+          SUB_TEST_NAME: embedded
     tags: [mod_wsgi]
   - name: mod-wsgi-embedded-mode-replica-set
     commands:
@@ -814,7 +814,7 @@ tasks:
       - func: run tests
         vars:
           TEST_NAME: mod_wsgi
-          SUB_TEST_NAME: embedded-mode
+          SUB_TEST_NAME: embedded
     tags: [mod_wsgi]
 
   # Ocsp tests

.evergreen/scripts/generate_config.py

@@ -897,7 +897,7 @@ def create_mod_wsgi_tasks():
         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)
+        vars = dict(TEST_NAME="mod_wsgi", SUB_TEST_NAME=test.split("-")[0])
         test_func = FunctionCall(func="run tests", vars=vars)
         tags = ["mod_wsgi"]
         commands = [server_func, test_func]

.evergreen/scripts/mod_wsgi_tester.py

@@ -30,7 +30,7 @@ def setup_mod_wsgi(sub_test_name: str) -> None:
         env["MOD_WSGI_CONF"] = "mod_wsgi_test.conf"
     else:
         raise ValueError("mod_wsgi sub test must be either 'standalone' or 'embedded'")
-    apache = which("apache")
+    apache = which("apache2")
     if not apache and Path("/usr/lib/apache2/mpm-prefork/apache2").exists():
         apache = "/usr/lib/apache2/mpm-prefork/apache2"
     if apache: