Skip to content

Commit b895b8d

Browse files
blink1073blink1073
committed
disable coverage on pypy
1 parent 6bb70b6 commit b895b8d

File tree

3 files changed

+30
-33
lines changed

3 files changed

+30
-33
lines changed

‎.evergreen/generated_configs/tasks.yml

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8032,168 +8032,164 @@ tasks:
80328032
- sync_async
80338033

80348034
# Server version tests
8035-
- name: test-python3.9-sharded-cluster-auth-ssl-cov
8035+
- name: test-python3.9-auth-ssl-cov
80368036
commands:
80378037
- func: run server
80388038
vars:
8039-
TOPOLOGY: sharded_cluster
80408039
AUTH: auth
80418040
SSL: ssl
80428041
COVERAGE: "1"
80438042
- func: run tests
80448043
vars:
80458044
AUTH: auth
80468045
SSL: ssl
8046+
COVERAGE: "1"
80478047
PYTHON_VERSION: "3.9"
80488048
tags: [server-version]
8049-
- name: test-python3.10-sharded-cluster-auth-ssl-cov
8049+
- name: test-python3.10-auth-ssl-cov
80508050
commands:
80518051
- func: run server
80528052
vars:
8053-
TOPOLOGY: sharded_cluster
80548053
AUTH: auth
80558054
SSL: ssl
80568055
COVERAGE: "1"
80578056
- func: run tests
80588057
vars:
80598058
AUTH: auth
80608059
SSL: ssl
8060+
COVERAGE: "1"
80618061
PYTHON_VERSION: "3.10"
80628062
tags: [server-version]
8063-
- name: test-python3.11-sharded-cluster-auth-ssl-cov
8063+
- name: test-python3.11-auth-ssl-cov
80648064
commands:
80658065
- func: run server
80668066
vars:
8067-
TOPOLOGY: sharded_cluster
80688067
AUTH: auth
80698068
SSL: ssl
80708069
COVERAGE: "1"
80718070
- func: run tests
80728071
vars:
80738072
AUTH: auth
80748073
SSL: ssl
8074+
COVERAGE: "1"
80758075
PYTHON_VERSION: "3.11"
80768076
tags: [server-version]
8077-
- name: test-python3.12-sharded-cluster-auth-ssl-cov
8077+
- name: test-python3.12-auth-ssl-cov
80788078
commands:
80798079
- func: run server
80808080
vars:
8081-
TOPOLOGY: sharded_cluster
80828081
AUTH: auth
80838082
SSL: ssl
80848083
COVERAGE: "1"
80858084
- func: run tests
80868085
vars:
80878086
AUTH: auth
80888087
SSL: ssl
8088+
COVERAGE: "1"
80898089
PYTHON_VERSION: "3.12"
80908090
tags: [server-version]
8091-
- name: test-python3.13-sharded-cluster-auth-ssl-cov
8091+
- name: test-python3.13-auth-ssl-cov
80928092
commands:
80938093
- func: run server
80948094
vars:
8095-
TOPOLOGY: sharded_cluster
80968095
AUTH: auth
80978096
SSL: ssl
80988097
COVERAGE: "1"
80998098
- func: run tests
81008099
vars:
81018100
AUTH: auth
81028101
SSL: ssl
8102+
COVERAGE: "1"
81038103
PYTHON_VERSION: "3.13"
81048104
tags: [server-version]
8105-
- name: test-pypy3.10-sharded-cluster-auth-ssl-cov
8105+
- name: test-pypy3.10-auth-ssl
81068106
commands:
81078107
- func: run server
81088108
vars:
8109-
TOPOLOGY: sharded_cluster
81108109
AUTH: auth
81118110
SSL: ssl
8112-
COVERAGE: "1"
81138111
- func: run tests
81148112
vars:
81158113
AUTH: auth
81168114
SSL: ssl
81178115
PYTHON_VERSION: pypy3.10
81188116
tags: [server-version]
8119-
- name: test-python3.9-standalone-noauth-nossl-cov
8117+
- name: test-python3.9-noauth-nossl-cov
81208118
commands:
81218119
- func: run server
81228120
vars:
8123-
TOPOLOGY: standalone
81248121
AUTH: noauth
81258122
SSL: nossl
81268123
COVERAGE: "1"
81278124
- func: run tests
81288125
vars:
81298126
AUTH: noauth
81308127
SSL: nossl
8128+
COVERAGE: "1"
81318129
PYTHON_VERSION: "3.9"
81328130
tags: [server-version]
8133-
- name: test-python3.10-replica-set-noauth-ssl-cov
8131+
- name: test-python3.10-noauth-ssl-cov
81348132
commands:
81358133
- func: run server
81368134
vars:
8137-
TOPOLOGY: replica_set
81388135
AUTH: noauth
81398136
SSL: ssl
81408137
COVERAGE: "1"
81418138
- func: run tests
81428139
vars:
81438140
AUTH: noauth
81448141
SSL: ssl
8142+
COVERAGE: "1"
81458143
PYTHON_VERSION: "3.10"
81468144
tags: [server-version]
8147-
- name: test-python3.11-standalone-noauth-nossl-cov
8145+
- name: test-python3.11-noauth-nossl-cov
81488146
commands:
81498147
- func: run server
81508148
vars:
8151-
TOPOLOGY: standalone
81528149
AUTH: noauth
81538150
SSL: nossl
81548151
COVERAGE: "1"
81558152
- func: run tests
81568153
vars:
81578154
AUTH: noauth
81588155
SSL: nossl
8156+
COVERAGE: "1"
81598157
PYTHON_VERSION: "3.11"
81608158
tags: [server-version]
8161-
- name: test-python3.12-replica-set-noauth-ssl-cov
8159+
- name: test-python3.12-noauth-ssl-cov
81628160
commands:
81638161
- func: run server
81648162
vars:
8165-
TOPOLOGY: replica_set
81668163
AUTH: noauth
81678164
SSL: ssl
81688165
COVERAGE: "1"
81698166
- func: run tests
81708167
vars:
81718168
AUTH: noauth
81728169
SSL: ssl
8170+
COVERAGE: "1"
81738171
PYTHON_VERSION: "3.12"
81748172
tags: [server-version]
8175-
- name: test-python3.13-standalone-noauth-nossl-cov
8173+
- name: test-python3.13-noauth-nossl-cov
81768174
commands:
81778175
- func: run server
81788176
vars:
8179-
TOPOLOGY: standalone
81808177
AUTH: noauth
81818178
SSL: nossl
81828179
COVERAGE: "1"
81838180
- func: run tests
81848181
vars:
81858182
AUTH: noauth
81868183
SSL: nossl
8184+
COVERAGE: "1"
81878185
PYTHON_VERSION: "3.13"
81888186
tags: [server-version]
8189-
- name: test-pypy3.10-replica-set-noauth-ssl-cov
8187+
- name: test-pypy3.10-noauth-ssl
81908188
commands:
81918189
- func: run server
81928190
vars:
8193-
TOPOLOGY: replica_set
81948191
AUTH: noauth
81958192
SSL: ssl
8196-
COVERAGE: "1"
81978193
- func: run tests
81988194
vars:
81998195
AUTH: noauth

‎.evergreen/scripts/generate_config.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -594,12 +594,13 @@ def create_server_version_tasks():
594594
else:
595595
auth = "auth"
596596
ssl = "ssl"
597-
name = get_task_name(
598-
"test", python=python, topology=topology, auth=auth, ssl=ssl, coverage="coverage"
599-
)
600-
server_vars = dict(TOPOLOGY=topology, AUTH=auth, SSL=ssl, COVERAGE="1")
601-
server_func = FunctionCall(func="run server", vars=server_vars)
602-
test_vars = dict(AUTH=auth, SSL=ssl, PYTHON_VERSION=python)
597+
expansions = dict(AUTH=auth, SSL=ssl)
598+
if python not in PYPYS:
599+
expansions["COVERAGE"] = "1"
600+
name = get_task_name("test", python=python, **expansions)
601+
server_func = FunctionCall(func="run server", vars=expansions)
602+
test_vars = expansions.copy()
603+
test_vars["PYTHON_VERSION"] = python
603604
test_func = FunctionCall(func="run tests", vars=test_vars)
604605
tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
605606
return tasks

‎.evergreen/scripts/generate_config_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
standalone="Standalone", replica_set="Replica Set", sharded_cluster="Sharded Cluster"
4545
),
4646
test_suites=dict(default="Sync", default_async="Async"),
47-
coverage=dict(coverage="cov"),
47+
coverage={"1": "cov"},
4848
no_ext={"1": "No C"},
4949
)
5050
HOSTS = dict()

0 commit comments

Comments
 (0)