Skip to content

Commit 6d2e27a

Browse files
authored
PYTHON-3355 Test with consistent versions of crypt_shared and server (#1033)
1 parent a20ff68 commit 6d2e27a

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.evergreen/config.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,8 @@ functions:
474474
export MULTI_MONGOS_LB_URI="${MONGODB_URI}"
475475
fi
476476
477-
PYTHON_BINARY=${PYTHON_BINARY} \
477+
MONGODB_VERSION=${VERSION} \
478+
PYTHON_BINARY=${PYTHON_BINARY} \
478479
GREEN_FRAMEWORK=${GREEN_FRAMEWORK} \
479480
C_EXTENSIONS=${C_EXTENSIONS} \
480481
COVERAGE=${COVERAGE} \
@@ -2316,6 +2317,7 @@ buildvariants:
23162317
encryption: [ "encryption_crypt_shared" ]
23172318
then:
23182319
remove_tasks:
2320+
- ".rapid"
23192321
- ".5.0"
23202322
- ".4.4"
23212323
- ".4.2"
@@ -2410,6 +2412,7 @@ buildvariants:
24102412
encryption: [ "encryption_crypt_shared" ]
24112413
then:
24122414
remove_tasks:
2415+
- ".rapid"
24132416
- ".5.0"
24142417
- ".4.4"
24152418
- ".4.2"
@@ -2519,6 +2522,7 @@ buildvariants:
25192522
encryption: [ "encryption_crypt_shared" ]
25202523
then:
25212524
remove_tasks:
2525+
- ".rapid"
25222526
- ".5.0"
25232527
- ".4.4"
25242528
- ".4.2"

.evergreen/run-tests.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ GREEN_FRAMEWORK=${GREEN_FRAMEWORK:-}
2626
C_EXTENSIONS=${C_EXTENSIONS:-}
2727
COVERAGE=${COVERAGE:-}
2828
COMPRESSORS=${COMPRESSORS:-}
29+
MONGODB_VERSION=${MONGODB_VERSION:-}
2930
MONGODB_API_VERSION=${MONGODB_API_VERSION:-}
3031
TEST_ENCRYPTION=${TEST_ENCRYPTION:-}
3132
TEST_CRYPT_SHARED=${TEST_CRYPT_SHARED:-}
@@ -151,9 +152,14 @@ if [ -n "$TEST_ENCRYPTION" ]; then
151152
. $DRIVERS_TOOLS/.evergreen/csfle/set-temp-creds.sh
152153

153154
if [ -n "$TEST_CRYPT_SHARED" ]; then
155+
REAL_VERSION=$(mongod --version | head -n1 | cut -d v -f3 | tr -d "\r")
156+
if [ "$MONGODB_VERSION" = "latest" ]; then
157+
REAL_VERSION="latest"
158+
fi
154159
echo "Testing CSFLE with crypt_shared lib"
155160
$PYTHON $DRIVERS_TOOLS/.evergreen/mongodl.py --component crypt_shared \
156-
--version latest --out ../crypt_shared/
161+
--version "$REAL_VERSION" \
162+
--out ../crypt_shared/
157163
export DYLD_FALLBACK_LIBRARY_PATH=../crypt_shared/lib/:$DYLD_FALLBACK_LIBRARY_PATH
158164
export LD_LIBRARY_PATH=../crypt_shared/lib:$LD_LIBRARY_PATH
159165
export PATH=../crypt_shared/bin:$PATH

test/client-side-encryption/spec/legacy/fle2-InsertFind-Unindexed.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
}
242242
},
243243
"result": {
244-
"errorContains": "Cannot query"
244+
"errorContains": "encrypt"
245245
}
246246
}
247247
]

0 commit comments

Comments
 (0)