Skip to content

Commit 6f6f116

Browse files
Fix code review remarks
1 parent 6754792 commit 6f6f116

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

.evergreen/config-atlas.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,14 +420,14 @@ functions:
420420
${PREPARE_SHELL}
421421
SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" MULTI_ATLASPROXY_SERVERLESS_URI="${MULTI_ATLASPROXY_SERVERLESS_URI}" SINGLE_ATLASPROXY_SERVERLESS_URI="${SINGLE_ATLASPROXY_SERVERLESS_URI}" .evergreen/run-tests-serverless.sh
422422
423-
"stat kmip server":
423+
"start kmip server":
424424
- command: shell.exec
425425
params:
426426
background: true
427427
shell: bash
428428
working_dir: "src"
429429
script: |
430-
source .evergreen/csfle/activate_venv.sh
430+
. .evergreen/csfle/activate_venv.sh
431431
python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/server.pem --port 7999 &
432432
python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/expired.pem --port 8000 &
433433
python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/wrong-host.pem --port 8001 &

.evergreen/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,14 +437,14 @@ functions:
437437
${PREPARE_SHELL}
438438
SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" MULTI_ATLASPROXY_SERVERLESS_URI="${MULTI_ATLASPROXY_SERVERLESS_URI}" SINGLE_ATLASPROXY_SERVERLESS_URI="${SINGLE_ATLASPROXY_SERVERLESS_URI}" .evergreen/run-tests-serverless.sh
439439
440-
"stat kmip server":
440+
"start kmip server":
441441
- command: shell.exec
442442
params:
443443
background: true
444444
shell: bash
445445
working_dir: "src"
446446
script: |
447-
source .evergreen/csfle/activate_venv.sh
447+
. .evergreen/csfle/activate_venv.sh
448448
python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/server.pem --port 7999 &
449449
python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/expired.pem --port 8000 &
450450
python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/wrong-host.pem --port 8001 &
@@ -485,7 +485,7 @@ tasks:
485485
- name: "test-fle"
486486
commands:
487487
- func: "export FLE credentials"
488-
- func: "stat kmip server"
488+
- func: "start kmip server"
489489
- func: "run tests"
490490
- name: "test-aws-auth"
491491
commands:

.evergreen/config/common.yml.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,14 +502,14 @@ functions:
502502
${PREPARE_SHELL}
503503
SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" MULTI_ATLASPROXY_SERVERLESS_URI="${MULTI_ATLASPROXY_SERVERLESS_URI}" SINGLE_ATLASPROXY_SERVERLESS_URI="${SINGLE_ATLASPROXY_SERVERLESS_URI}" .evergreen/run-tests-serverless.sh
504504

505-
"stat kmip server":
505+
"start kmip server":
506506
- command: shell.exec
507507
params:
508508
background: true
509509
shell: bash
510510
working_dir: "src"
511511
script: |
512-
source .evergreen/csfle/activate_venv.sh
512+
. .evergreen/csfle/activate_venv.sh
513513
python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/server.pem --port 7999 &
514514
python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/expired.pem --port 8000 &
515515
python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/wrong-host.pem --port 8001 &
@@ -561,7 +561,7 @@ tasks:
561561
- name: "test-fle"
562562
commands:
563563
- func: "export FLE credentials"
564-
- func: "stat kmip server"
564+
- func: "start kmip server"
565565
- func: "run tests"
566566
- name: "test-aws-auth"
567567
commands:

.evergreen/run-tests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ if test -n "$FLE"; then
143143
echo "Waiting for mock KMS servers to start..."
144144
wait_for_kms_server() {
145145
for i in $(seq 60); do
146-
# Exit code 7: "Failed to connect to host".
147146
if curl -s "localhost:$1"; test $? -ne 7; then
148147
return 0
149148
else

0 commit comments

Comments
 (0)