Skip to content

Commit 23b3573

Browse files
blink1073blink1073
committed
address review
1 parent 41ca2ca commit 23b3573

File tree

2 files changed

+220
-1
lines changed

2 files changed

+220
-1
lines changed

‎.evergreen/generated_configs/tasks.yml‎

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7666,6 +7666,214 @@ tasks:
76667666
- python-pypy3.10
76677667
- sharded_cluster-noauth-nossl
76687668
- async
7669+
- name: test-server-version-python3.9-sync-auth-ssl-sharded-cluster-cov
7670+
commands:
7671+
- func: run server
7672+
vars:
7673+
AUTH: auth
7674+
SSL: ssl
7675+
TOPOLOGY: sharded_cluster
7676+
COVERAGE: "1"
7677+
- func: run tests
7678+
vars:
7679+
AUTH: auth
7680+
SSL: ssl
7681+
TOPOLOGY: sharded_cluster
7682+
COVERAGE: "1"
7683+
PYTHON_VERSION: "3.9"
7684+
TEST_NAME: default_sync
7685+
tags:
7686+
- server-version
7687+
- python-3.9
7688+
- sharded_cluster-auth-ssl
7689+
- sync
7690+
- name: test-server-version-python3.9-async-auth-ssl-sharded-cluster-cov
7691+
commands:
7692+
- func: run server
7693+
vars:
7694+
AUTH: auth
7695+
SSL: ssl
7696+
TOPOLOGY: sharded_cluster
7697+
COVERAGE: "1"
7698+
- func: run tests
7699+
vars:
7700+
AUTH: auth
7701+
SSL: ssl
7702+
TOPOLOGY: sharded_cluster
7703+
COVERAGE: "1"
7704+
PYTHON_VERSION: "3.9"
7705+
TEST_NAME: default_async
7706+
tags:
7707+
- server-version
7708+
- python-3.9
7709+
- sharded_cluster-auth-ssl
7710+
- async
7711+
- name: test-server-version-python3.10-sync-auth-ssl-sharded-cluster-cov
7712+
commands:
7713+
- func: run server
7714+
vars:
7715+
AUTH: auth
7716+
SSL: ssl
7717+
TOPOLOGY: sharded_cluster
7718+
COVERAGE: "1"
7719+
- func: run tests
7720+
vars:
7721+
AUTH: auth
7722+
SSL: ssl
7723+
TOPOLOGY: sharded_cluster
7724+
COVERAGE: "1"
7725+
PYTHON_VERSION: "3.10"
7726+
TEST_NAME: default_sync
7727+
tags:
7728+
- server-version
7729+
- python-3.10
7730+
- sharded_cluster-auth-ssl
7731+
- sync
7732+
- name: test-server-version-python3.10-async-auth-ssl-sharded-cluster-cov
7733+
commands:
7734+
- func: run server
7735+
vars:
7736+
AUTH: auth
7737+
SSL: ssl
7738+
TOPOLOGY: sharded_cluster
7739+
COVERAGE: "1"
7740+
- func: run tests
7741+
vars:
7742+
AUTH: auth
7743+
SSL: ssl
7744+
TOPOLOGY: sharded_cluster
7745+
COVERAGE: "1"
7746+
PYTHON_VERSION: "3.10"
7747+
TEST_NAME: default_async
7748+
tags:
7749+
- server-version
7750+
- python-3.10
7751+
- sharded_cluster-auth-ssl
7752+
- async
7753+
- name: test-server-version-python3.11-sync-auth-ssl-sharded-cluster-cov
7754+
commands:
7755+
- func: run server
7756+
vars:
7757+
AUTH: auth
7758+
SSL: ssl
7759+
TOPOLOGY: sharded_cluster
7760+
COVERAGE: "1"
7761+
- func: run tests
7762+
vars:
7763+
AUTH: auth
7764+
SSL: ssl
7765+
TOPOLOGY: sharded_cluster
7766+
COVERAGE: "1"
7767+
PYTHON_VERSION: "3.11"
7768+
TEST_NAME: default_sync
7769+
tags:
7770+
- server-version
7771+
- python-3.11
7772+
- sharded_cluster-auth-ssl
7773+
- sync
7774+
- name: test-server-version-python3.11-async-auth-ssl-sharded-cluster-cov
7775+
commands:
7776+
- func: run server
7777+
vars:
7778+
AUTH: auth
7779+
SSL: ssl
7780+
TOPOLOGY: sharded_cluster
7781+
COVERAGE: "1"
7782+
- func: run tests
7783+
vars:
7784+
AUTH: auth
7785+
SSL: ssl
7786+
TOPOLOGY: sharded_cluster
7787+
COVERAGE: "1"
7788+
PYTHON_VERSION: "3.11"
7789+
TEST_NAME: default_async
7790+
tags:
7791+
- server-version
7792+
- python-3.11
7793+
- sharded_cluster-auth-ssl
7794+
- async
7795+
- name: test-server-version-python3.12-sync-auth-ssl-sharded-cluster-cov
7796+
commands:
7797+
- func: run server
7798+
vars:
7799+
AUTH: auth
7800+
SSL: ssl
7801+
TOPOLOGY: sharded_cluster
7802+
COVERAGE: "1"
7803+
- func: run tests
7804+
vars:
7805+
AUTH: auth
7806+
SSL: ssl
7807+
TOPOLOGY: sharded_cluster
7808+
COVERAGE: "1"
7809+
PYTHON_VERSION: "3.12"
7810+
TEST_NAME: default_sync
7811+
tags:
7812+
- server-version
7813+
- python-3.12
7814+
- sharded_cluster-auth-ssl
7815+
- sync
7816+
- name: test-server-version-python3.12-async-auth-ssl-sharded-cluster-cov
7817+
commands:
7818+
- func: run server
7819+
vars:
7820+
AUTH: auth
7821+
SSL: ssl
7822+
TOPOLOGY: sharded_cluster
7823+
COVERAGE: "1"
7824+
- func: run tests
7825+
vars:
7826+
AUTH: auth
7827+
SSL: ssl
7828+
TOPOLOGY: sharded_cluster
7829+
COVERAGE: "1"
7830+
PYTHON_VERSION: "3.12"
7831+
TEST_NAME: default_async
7832+
tags:
7833+
- server-version
7834+
- python-3.12
7835+
- sharded_cluster-auth-ssl
7836+
- async
7837+
- name: test-server-version-python3.13-async-auth-ssl-sharded-cluster-cov
7838+
commands:
7839+
- func: run server
7840+
vars:
7841+
AUTH: auth
7842+
SSL: ssl
7843+
TOPOLOGY: sharded_cluster
7844+
COVERAGE: "1"
7845+
- func: run tests
7846+
vars:
7847+
AUTH: auth
7848+
SSL: ssl
7849+
TOPOLOGY: sharded_cluster
7850+
COVERAGE: "1"
7851+
PYTHON_VERSION: "3.13"
7852+
TEST_NAME: default_async
7853+
tags:
7854+
- server-version
7855+
- python-3.13
7856+
- sharded_cluster-auth-ssl
7857+
- async
7858+
- name: test-server-version-pypy3.10-sync-auth-ssl-sharded-cluster
7859+
commands:
7860+
- func: run server
7861+
vars:
7862+
AUTH: auth
7863+
SSL: ssl
7864+
TOPOLOGY: sharded_cluster
7865+
- func: run tests
7866+
vars:
7867+
AUTH: auth
7868+
SSL: ssl
7869+
TOPOLOGY: sharded_cluster
7870+
PYTHON_VERSION: pypy3.10
7871+
TEST_NAME: default_sync
7872+
tags:
7873+
- server-version
7874+
- python-pypy3.10
7875+
- sharded_cluster-auth-ssl
7876+
- sync
76697877

76707878
# Serverless tests
76717879
- name: test-serverless

‎.evergreen/scripts/generate_config.py‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,10 +591,21 @@ def create_aws_lambda_variants():
591591

592592
def create_server_version_tasks():
593593
tasks = []
594-
# Test all combinations of topology, auth, ssl, and sync, with rotating pythons.
594+
task_inputs = []
595+
# All combinations of topology, auth, ssl, and sync should be tested.
595596
for (topology, auth, ssl, sync), python in zip_cycle(
596597
list(product(TOPOLOGIES, ["auth", "noauth"], ["ssl", "nossl"], SYNCS)), ALL_PYTHONS
597598
):
599+
task_inputs.append((topology, auth, ssl, sync, python))
600+
601+
# Every python should be tested with sharded cluster auth ssl, sync and async.
602+
for python, sync in product(ALL_PYTHONS, SYNCS):
603+
task_input = ("sharded_cluster", "auth", "ssl", sync, python)
604+
if task_input not in task_inputs:
605+
task_inputs.append(task_input)
606+
607+
# Assemble the tasks.
608+
for topology, auth, ssl, sync, python in task_inputs:
598609
tags = ["server-version", f"python-{python}", f"{topology}-{auth}-{ssl}", sync]
599610
expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
600611
if python not in PYPYS:

0 commit comments

Comments
 (0)