Skip to content

Commit 77fdf20

Browse files
authored
PYTHON-6104 - remove mod wsgi from evergreen (#3060)
1 parent 7552bcb commit 77fdf20

9 files changed

Lines changed: 1 addition & 241 deletions

File tree

‎.evergreen/generated_configs/tasks.yml‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -316,80 +316,6 @@ tasks:
316316
TOPOLOGY: sharded_cluster
317317
tags: [test-min-support]
318318

319-
# Mod wsgi tests
320-
- name: mod-wsgi-replica-set-python3.10
321-
commands:
322-
- func: run server
323-
vars:
324-
TOPOLOGY: replica_set
325-
TOOLCHAIN_VERSION: "3.10"
326-
- func: run tests
327-
vars:
328-
TEST_NAME: mod_wsgi
329-
SUB_TEST_NAME: standalone
330-
TOOLCHAIN_VERSION: "3.10"
331-
tags: [mod_wsgi, pr]
332-
- name: mod-wsgi-embedded-mode-replica-set-python3.11
333-
commands:
334-
- func: run server
335-
vars:
336-
TOPOLOGY: replica_set
337-
TOOLCHAIN_VERSION: "3.11"
338-
- func: run tests
339-
vars:
340-
TEST_NAME: mod_wsgi
341-
SUB_TEST_NAME: embedded
342-
TOOLCHAIN_VERSION: "3.11"
343-
tags: [mod_wsgi, pr]
344-
- name: mod-wsgi-replica-set-python3.12
345-
commands:
346-
- func: run server
347-
vars:
348-
TOPOLOGY: replica_set
349-
TOOLCHAIN_VERSION: "3.12"
350-
- func: run tests
351-
vars:
352-
TEST_NAME: mod_wsgi
353-
SUB_TEST_NAME: standalone
354-
TOOLCHAIN_VERSION: "3.12"
355-
tags: [mod_wsgi, pr]
356-
- name: mod-wsgi-embedded-mode-replica-set-python3.13
357-
commands:
358-
- func: run server
359-
vars:
360-
TOPOLOGY: replica_set
361-
TOOLCHAIN_VERSION: "3.13"
362-
- func: run tests
363-
vars:
364-
TEST_NAME: mod_wsgi
365-
SUB_TEST_NAME: embedded
366-
TOOLCHAIN_VERSION: "3.13"
367-
tags: [mod_wsgi, pr]
368-
- name: mod-wsgi-embedded-mode-replica-set-python3.14
369-
commands:
370-
- func: run server
371-
vars:
372-
TOPOLOGY: replica_set
373-
TOOLCHAIN_VERSION: "3.14"
374-
- func: run tests
375-
vars:
376-
TEST_NAME: mod_wsgi
377-
SUB_TEST_NAME: embedded
378-
TOOLCHAIN_VERSION: "3.14"
379-
tags: [mod_wsgi, pr]
380-
- name: mod-wsgi-embedded-mode-replica-set-python3.15
381-
commands:
382-
- func: run server
383-
vars:
384-
TOPOLOGY: replica_set
385-
TOOLCHAIN_VERSION: "3.15"
386-
- func: run tests
387-
vars:
388-
TEST_NAME: mod_wsgi
389-
SUB_TEST_NAME: embedded
390-
TOOLCHAIN_VERSION: "3.15"
391-
tags: [mod_wsgi, pr]
392-
393319
# No orchestration tests
394320
- name: test-no-orchestration-python3.10-min-deps
395321
commands:

‎.evergreen/generated_configs/variants.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -384,16 +384,6 @@ buildvariants:
384384
TEST_NAME: mockupdb
385385
tags: [pr]
386386

387-
# Mod wsgi tests
388-
- name: mod_wsgi-ubuntu-22
389-
tasks:
390-
- name: .mod_wsgi
391-
display_name: Mod_WSGI Ubuntu-22
392-
run_on:
393-
- ubuntu2204-small
394-
expansions:
395-
MOD_WSGI_VERSION: "4"
396-
397387
# No c ext tests
398388
- name: no-c-ext-rhel8
399389
tasks:

‎.evergreen/scripts/generate_config.py‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -400,14 +400,6 @@ def create_no_c_ext_variants():
400400
return [create_variant(tasks, display_name, host=host, expansions=expansions)]
401401

402402

403-
def create_mod_wsgi_variants():
404-
host = HOSTS["ubuntu22"]
405-
tasks = [".mod_wsgi"]
406-
expansions = dict(MOD_WSGI_VERSION="4")
407-
display_name = get_variant_name("Mod_WSGI", host)
408-
return [create_variant(tasks, display_name, host=host, expansions=expansions)]
409-
410-
411403
def create_disable_test_commands_variants():
412404
host = DEFAULT_HOST
413405
expansions = dict(AUTH="auth", SSL="ssl", DISABLE_TEST_COMMANDS="1")
@@ -1012,31 +1004,6 @@ def create_oidc_tasks():
10121004
return tasks
10131005

10141006

1015-
def create_mod_wsgi_tasks():
1016-
tasks = []
1017-
for (test, topology), python in zip_cycle(
1018-
product(["standalone", "embedded-mode"], ["standalone", "replica_set"]), CPYTHONS
1019-
):
1020-
if "t" in python:
1021-
continue
1022-
if test == "standalone":
1023-
task_name = "mod-wsgi-"
1024-
else:
1025-
task_name = "mod-wsgi-embedded-mode-"
1026-
task_name += topology.replace("_", "-")
1027-
task_name = get_task_name(task_name, python=python)
1028-
server_vars = dict(TOPOLOGY=topology, TOOLCHAIN_VERSION=python)
1029-
server_func = FunctionCall(func="run server", vars=server_vars)
1030-
vars = dict(
1031-
TEST_NAME="mod_wsgi", SUB_TEST_NAME=test.split("-")[0], TOOLCHAIN_VERSION=python
1032-
)
1033-
test_func = FunctionCall(func="run tests", vars=vars)
1034-
tags = ["mod_wsgi", "pr"]
1035-
commands = [server_func, test_func]
1036-
tasks.append(EvgTask(name=task_name, tags=tags, commands=commands))
1037-
return tasks
1038-
1039-
10401007
def _create_ocsp_tasks(algo, variant, server_type, base_task_name):
10411008
tasks = []
10421009
file_name = f"{algo}-basic-tls-ocsp-{variant}.json"

‎.evergreen/scripts/mod_wsgi_tester.py‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎.evergreen/scripts/run_tests.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,6 @@ def run() -> None:
158158
if TEST_PERF:
159159
start_time = datetime.now()
160160

161-
# Run mod_wsgi tests using the helper.
162-
if TEST_NAME == "mod_wsgi":
163-
from mod_wsgi_tester import test_mod_wsgi
164-
165-
test_mod_wsgi()
166-
return
167-
168161
# Send kms tests to run remotely.
169162
if TEST_NAME == "kms" and SUB_TEST_NAME in ["azure", "gcp"]:
170163
from kms_tester import test_kms_send_to_remote

‎.evergreen/scripts/setup_tests.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,6 @@ def handle_test_env() -> None:
332332
cmd = f'bash "{DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh" start'
333333
run_command(cmd)
334334

335-
if test_name == "mod_wsgi":
336-
from mod_wsgi_tester import setup_mod_wsgi
337-
338-
setup_mod_wsgi(sub_test_name)
339-
340335
if test_name == "ocsp":
341336
if sub_test_name:
342337
os.environ["OCSP_SERVER_TYPE"] = sub_test_name

‎.evergreen/scripts/teardown_tests.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@
5151
shutil.rmtree(ROOT / "specifications", ignore_errors=True)
5252
Path(os.environ["OUTPUT_FILE"]).unlink(missing_ok=True)
5353

54-
# Tear down mog_wsgi if applicable.
55-
elif TEST_NAME == "mod_wsgi":
56-
from mod_wsgi_tester import teardown_mod_wsgi
57-
58-
teardown_mod_wsgi()
59-
6054
# Tear down coverage if applicable.
6155
if os.environ.get("COVERAGE"):
6256
shutil.rmtree(".pytest_cache", ignore_errors=True)

‎.evergreen/scripts/utils.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ class Distro:
6363
"ecs-remote",
6464
],
6565
"kms": ["azure", "azure-remote", "azure-fail", "gcp", "gcp-remote", "gcp-fail"],
66-
"mod_wsgi": ["standalone", "embedded"],
6766
"perf": ["sync", "async"],
6867
"auth_oidc": [
6968
"default",
@@ -80,7 +79,7 @@ class Distro:
8079
],
8180
}
8281

83-
EXTRA_TESTS = ["mod_wsgi", "aws_lambda", "doctest"]
82+
EXTRA_TESTS = ["aws_lambda", "doctest"]
8483

8584
# Tests that do not use run-mongodb directly.
8685
NO_RUN_ORCHESTRATION = [

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -349,17 +349,6 @@ You will need to set up access to the `drivers-test-secrets-role`, see the [Wiki
349349
- Run `just setup-tests aws_lambda`.
350350
- Run `just run-tests`.
351351

352-
### mod_wsgi tests
353-
354-
Note: these tests can only be run from an Evergreen Linux host that has the Python toolchain.
355-
356-
- Run `just run-server`.
357-
- Run `just setup-tests mod_wsgi <mode>`.
358-
- Run `just run-tests`.
359-
360-
The `mode` can be `standalone` or `embedded`. For the `replica_set` version of the tests, use
361-
`TOPOLOGY=replica_set just run-server`.
362-
363352
### OCSP tests
364353

365354
- Export the orchestration file, e.g. `export ORCHESTRATION_FILE=rsa-basic-tls-ocsp-disableStapling.json`.

0 commit comments

Comments
 (0)