Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 0 additions & 74 deletions .evergreen/generated_configs/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -316,80 +316,6 @@ tasks:
TOPOLOGY: sharded_cluster
tags: [test-min-support]

# Mod wsgi tests
- name: mod-wsgi-replica-set-python3.10
commands:
- func: run server
vars:
TOPOLOGY: replica_set
TOOLCHAIN_VERSION: "3.10"
- func: run tests
vars:
TEST_NAME: mod_wsgi
SUB_TEST_NAME: standalone
TOOLCHAIN_VERSION: "3.10"
tags: [mod_wsgi, pr]
- name: mod-wsgi-embedded-mode-replica-set-python3.11
commands:
- func: run server
vars:
TOPOLOGY: replica_set
TOOLCHAIN_VERSION: "3.11"
- func: run tests
vars:
TEST_NAME: mod_wsgi
SUB_TEST_NAME: embedded
TOOLCHAIN_VERSION: "3.11"
tags: [mod_wsgi, pr]
- name: mod-wsgi-replica-set-python3.12
commands:
- func: run server
vars:
TOPOLOGY: replica_set
TOOLCHAIN_VERSION: "3.12"
- func: run tests
vars:
TEST_NAME: mod_wsgi
SUB_TEST_NAME: standalone
TOOLCHAIN_VERSION: "3.12"
tags: [mod_wsgi, pr]
- name: mod-wsgi-embedded-mode-replica-set-python3.13
commands:
- func: run server
vars:
TOPOLOGY: replica_set
TOOLCHAIN_VERSION: "3.13"
- func: run tests
vars:
TEST_NAME: mod_wsgi
SUB_TEST_NAME: embedded
TOOLCHAIN_VERSION: "3.13"
tags: [mod_wsgi, pr]
- name: mod-wsgi-embedded-mode-replica-set-python3.14
commands:
- func: run server
vars:
TOPOLOGY: replica_set
TOOLCHAIN_VERSION: "3.14"
- func: run tests
vars:
TEST_NAME: mod_wsgi
SUB_TEST_NAME: embedded
TOOLCHAIN_VERSION: "3.14"
tags: [mod_wsgi, pr]
- name: mod-wsgi-embedded-mode-replica-set-python3.15
commands:
- func: run server
vars:
TOPOLOGY: replica_set
TOOLCHAIN_VERSION: "3.15"
- func: run tests
vars:
TEST_NAME: mod_wsgi
SUB_TEST_NAME: embedded
TOOLCHAIN_VERSION: "3.15"
tags: [mod_wsgi, pr]

# No orchestration tests
- name: test-no-orchestration-python3.10-min-deps
commands:
Expand Down
10 changes: 0 additions & 10 deletions .evergreen/generated_configs/variants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -384,16 +384,6 @@ buildvariants:
TEST_NAME: mockupdb
tags: [pr]

# Mod wsgi tests
- name: mod_wsgi-ubuntu-22
tasks:
- name: .mod_wsgi
display_name: Mod_WSGI Ubuntu-22
run_on:
- ubuntu2204-small
expansions:
MOD_WSGI_VERSION: "4"

# No c ext tests
- name: no-c-ext-rhel8
tasks:
Expand Down
33 changes: 0 additions & 33 deletions .evergreen/scripts/generate_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,14 +400,6 @@ def create_no_c_ext_variants():
return [create_variant(tasks, display_name, host=host, expansions=expansions)]


def create_mod_wsgi_variants():
host = HOSTS["ubuntu22"]
tasks = [".mod_wsgi"]
expansions = dict(MOD_WSGI_VERSION="4")
display_name = get_variant_name("Mod_WSGI", host)
return [create_variant(tasks, display_name, host=host, expansions=expansions)]


def create_disable_test_commands_variants():
host = DEFAULT_HOST
expansions = dict(AUTH="auth", SSL="ssl", DISABLE_TEST_COMMANDS="1")
Expand Down Expand Up @@ -1012,31 +1004,6 @@ def create_oidc_tasks():
return tasks


def create_mod_wsgi_tasks():
tasks = []
for (test, topology), python in zip_cycle(
product(["standalone", "embedded-mode"], ["standalone", "replica_set"]), CPYTHONS
):
if "t" in python:
continue
if test == "standalone":
task_name = "mod-wsgi-"
else:
task_name = "mod-wsgi-embedded-mode-"
task_name += topology.replace("_", "-")
task_name = get_task_name(task_name, python=python)
server_vars = dict(TOPOLOGY=topology, TOOLCHAIN_VERSION=python)
server_func = FunctionCall(func="run server", vars=server_vars)
vars = dict(
TEST_NAME="mod_wsgi", SUB_TEST_NAME=test.split("-")[0], TOOLCHAIN_VERSION=python
)
test_func = FunctionCall(func="run tests", vars=vars)
tags = ["mod_wsgi", "pr"]
commands = [server_func, test_func]
tasks.append(EvgTask(name=task_name, tags=tags, commands=commands))
return tasks


def _create_ocsp_tasks(algo, variant, server_type, base_task_name):
tasks = []
file_name = f"{algo}-basic-tls-ocsp-{variant}.json"
Expand Down
93 changes: 0 additions & 93 deletions .evergreen/scripts/mod_wsgi_tester.py

This file was deleted.

7 changes: 0 additions & 7 deletions .evergreen/scripts/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,6 @@ def run() -> None:
if TEST_PERF:
start_time = datetime.now()

# Run mod_wsgi tests using the helper.
if TEST_NAME == "mod_wsgi":
from mod_wsgi_tester import test_mod_wsgi

test_mod_wsgi()
return

# Send kms tests to run remotely.
if TEST_NAME == "kms" and SUB_TEST_NAME in ["azure", "gcp"]:
from kms_tester import test_kms_send_to_remote
Expand Down
5 changes: 0 additions & 5 deletions .evergreen/scripts/setup_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,6 @@ def handle_test_env() -> None:
cmd = f'bash "{DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh" start'
run_command(cmd)

if test_name == "mod_wsgi":
from mod_wsgi_tester import setup_mod_wsgi

setup_mod_wsgi(sub_test_name)

if test_name == "ocsp":
if sub_test_name:
os.environ["OCSP_SERVER_TYPE"] = sub_test_name
Expand Down
6 changes: 0 additions & 6 deletions .evergreen/scripts/teardown_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@
shutil.rmtree(ROOT / "specifications", ignore_errors=True)
Path(os.environ["OUTPUT_FILE"]).unlink(missing_ok=True)

# Tear down mog_wsgi if applicable.
elif TEST_NAME == "mod_wsgi":
from mod_wsgi_tester import teardown_mod_wsgi

teardown_mod_wsgi()

# Tear down coverage if applicable.
if os.environ.get("COVERAGE"):
shutil.rmtree(".pytest_cache", ignore_errors=True)
Expand Down
3 changes: 1 addition & 2 deletions .evergreen/scripts/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ class Distro:
"ecs-remote",
],
"kms": ["azure", "azure-remote", "azure-fail", "gcp", "gcp-remote", "gcp-fail"],
"mod_wsgi": ["standalone", "embedded"],
"perf": ["sync", "async"],
"auth_oidc": [
"default",
Expand All @@ -80,7 +79,7 @@ class Distro:
],
}

EXTRA_TESTS = ["mod_wsgi", "aws_lambda", "doctest"]
EXTRA_TESTS = ["aws_lambda", "doctest"]

# Tests that do not use run-mongodb directly.
NO_RUN_ORCHESTRATION = [
Expand Down
11 changes: 0 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -349,17 +349,6 @@ You will need to set up access to the `drivers-test-secrets-role`, see the [Wiki
- Run `just setup-tests aws_lambda`.
- Run `just run-tests`.

### mod_wsgi tests

Note: these tests can only be run from an Evergreen Linux host that has the Python toolchain.

- Run `just run-server`.
- Run `just setup-tests mod_wsgi <mode>`.
- Run `just run-tests`.

The `mode` can be `standalone` or `embedded`. For the `replica_set` version of the tests, use
`TOPOLOGY=replica_set just run-server`.

### OCSP tests

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