Skip to content

Commit ba138da

Browse files
baileympearsonbaileympearson
committed
fix failing tests
1 parent e3ea809 commit ba138da

File tree

3 files changed

+34
-68
lines changed

3 files changed

+34
-68
lines changed

‎.evergreen/config.in.yml‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -216,43 +216,26 @@ functions:
216216
bash ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop
217217
218218
"run-lb-tests":
219-
- command: shell.exec
219+
- command: subprocess.exec
220220
type: test
221221
params:
222-
shell: bash
222+
add_expansions_to_env: true
223+
binary: bash
223224
working_dir: src
224225
timeout_secs: 300
225-
script: |
226-
${PREPARE_SHELL}
227-
228-
MONGODB_URI="${MONGODB_URI}" \
229-
AUTH=${AUTH} \
230-
SSL=${SSL} \
231-
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
232-
SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \
233-
MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \
234-
TOPOLOGY="${TOPOLOGY}" \
235-
SKIP_DEPS=${SKIP_DEPS|1} \
236-
LOAD_BALANCER="${LOAD_BALANCER}" \
237-
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
226+
args:
227+
- .evergreen/run-tests.sh
238228

239229
"run-compression-tests":
240-
- command: shell.exec
230+
- command: subprocess.exec
241231
type: test
242232
params:
233+
binary: bash
243234
working_dir: src
244235
timeout_secs: 300
245-
script: |
246-
${PREPARE_SHELL}
247-
248-
MONGODB_URI="${MONGODB_URI}" \
249-
AUTH=${AUTH} \
250-
SSL=${SSL} \
251-
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
252-
TOPOLOGY="${TOPOLOGY}" \
253-
COMPRESSOR="${COMPRESSOR}" \
254-
SKIP_DEPS=${SKIP_DEPS|1} \
255-
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
236+
add_expansions_to_env: true
237+
args:
238+
- .evergreen/run-tests.sh
256239

257240
"install package":
258241
- command: shell.exec

‎.evergreen/config.yml‎

Lines changed: 22 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -184,42 +184,25 @@ functions:
184184
script: |
185185
bash ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop
186186
run-lb-tests:
187-
- command: shell.exec
187+
- command: subprocess.exec
188188
type: test
189189
params:
190-
shell: bash
190+
add_expansions_to_env: true
191+
binary: bash
191192
working_dir: src
192193
timeout_secs: 300
193-
script: |
194-
${PREPARE_SHELL}
195-
196-
MONGODB_URI="${MONGODB_URI}" \
197-
AUTH=${AUTH} \
198-
SSL=${SSL} \
199-
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
200-
SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \
201-
MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \
202-
TOPOLOGY="${TOPOLOGY}" \
203-
SKIP_DEPS=${SKIP_DEPS|1} \
204-
LOAD_BALANCER="${LOAD_BALANCER}" \
205-
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
194+
args:
195+
- .evergreen/run-tests.sh
206196
run-compression-tests:
207-
- command: shell.exec
197+
- command: subprocess.exec
208198
type: test
209199
params:
200+
binary: bash
210201
working_dir: src
211202
timeout_secs: 300
212-
script: |
213-
${PREPARE_SHELL}
214-
215-
MONGODB_URI="${MONGODB_URI}" \
216-
AUTH=${AUTH} \
217-
SSL=${SSL} \
218-
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
219-
TOPOLOGY="${TOPOLOGY}" \
220-
COMPRESSOR="${COMPRESSOR}" \
221-
SKIP_DEPS=${SKIP_DEPS|1} \
222-
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
203+
add_expansions_to_env: true
204+
args:
205+
- .evergreen/run-tests.sh
223206
install package:
224207
- command: shell.exec
225208
params:
@@ -1744,8 +1727,8 @@ tasks:
17441727
- {key: TOPOLOGY, value: sharded_cluster}
17451728
- {key: AUTH, value: auth}
17461729
- {key: LOAD_BALANCER, value: 'true'}
1747-
- {key: CLIENT_ENCRYPTION, value: 'true'}
1748-
- {key: TEST_CSFLE, value: 'true'}
1730+
- {key: CLIENT_ENCRYPTION, value: 'false'}
1731+
- {key: TEST_CSFLE, value: 'false'}
17491732
- func: install dependencies
17501733
- func: bootstrap mongo-orchestration
17511734
- func: start-load-balancer
@@ -1765,8 +1748,8 @@ tasks:
17651748
- {key: TOPOLOGY, value: sharded_cluster}
17661749
- {key: AUTH, value: auth}
17671750
- {key: LOAD_BALANCER, value: 'true'}
1768-
- {key: CLIENT_ENCRYPTION, value: 'true'}
1769-
- {key: TEST_CSFLE, value: 'true'}
1751+
- {key: CLIENT_ENCRYPTION, value: 'false'}
1752+
- {key: TEST_CSFLE, value: 'false'}
17701753
- func: install dependencies
17711754
- func: bootstrap mongo-orchestration
17721755
- func: start-load-balancer
@@ -1786,8 +1769,8 @@ tasks:
17861769
- {key: TOPOLOGY, value: sharded_cluster}
17871770
- {key: AUTH, value: auth}
17881771
- {key: LOAD_BALANCER, value: 'true'}
1789-
- {key: CLIENT_ENCRYPTION, value: 'true'}
1790-
- {key: TEST_CSFLE, value: 'true'}
1772+
- {key: CLIENT_ENCRYPTION, value: 'false'}
1773+
- {key: TEST_CSFLE, value: 'false'}
17911774
- func: install dependencies
17921775
- func: bootstrap mongo-orchestration
17931776
- func: start-load-balancer
@@ -1807,8 +1790,8 @@ tasks:
18071790
- {key: TOPOLOGY, value: sharded_cluster}
18081791
- {key: AUTH, value: auth}
18091792
- {key: LOAD_BALANCER, value: 'true'}
1810-
- {key: CLIENT_ENCRYPTION, value: 'true'}
1811-
- {key: TEST_CSFLE, value: 'true'}
1793+
- {key: CLIENT_ENCRYPTION, value: 'false'}
1794+
- {key: TEST_CSFLE, value: 'false'}
18121795
- func: install dependencies
18131796
- func: bootstrap mongo-orchestration
18141797
- func: start-load-balancer
@@ -1828,8 +1811,8 @@ tasks:
18281811
- {key: TOPOLOGY, value: sharded_cluster}
18291812
- {key: AUTH, value: auth}
18301813
- {key: LOAD_BALANCER, value: 'true'}
1831-
- {key: CLIENT_ENCRYPTION, value: 'true'}
1832-
- {key: TEST_CSFLE, value: 'true'}
1814+
- {key: CLIENT_ENCRYPTION, value: 'false'}
1815+
- {key: TEST_CSFLE, value: 'false'}
18331816
- func: install dependencies
18341817
- func: bootstrap mongo-orchestration
18351818
- func: start-load-balancer
@@ -1849,8 +1832,8 @@ tasks:
18491832
- {key: TOPOLOGY, value: sharded_cluster}
18501833
- {key: AUTH, value: auth}
18511834
- {key: LOAD_BALANCER, value: 'true'}
1852-
- {key: CLIENT_ENCRYPTION, value: 'true'}
1853-
- {key: TEST_CSFLE, value: 'true'}
1835+
- {key: CLIENT_ENCRYPTION, value: 'false'}
1836+
- {key: TEST_CSFLE, value: 'false'}
18541837
- func: install dependencies
18551838
- func: bootstrap mongo-orchestration
18561839
- func: start-load-balancer

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ TASKS.push(
149149
TOPOLOGY: 'sharded_cluster',
150150
AUTH: 'auth',
151151
LOAD_BALANCER: 'true',
152-
CLIENT_ENCRYPTION: 'true',
153-
TEST_CSFLE: 'true'
152+
CLIENT_ENCRYPTION: 'false',
153+
TEST_CSFLE: 'false'
154154
}),
155155
{ func: 'install dependencies' },
156156
{ func: 'bootstrap mongo-orchestration' },

0 commit comments

Comments
 (0)