Skip to content

Commit 90c631a

Browse files
committed
Require server 4.2+ for CSFLE integration tests
1 parent 5e2afa5 commit 90c631a

20 files changed

+20
-0
lines changed

tests/clientEncryption/clientEncryption-addKeyAltName-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::addKeyAltName()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-addKeyAltName-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::addKeyAltName() when key does not exist
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-createDataKey-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::createDataKey()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-createDataKey-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::createDataKey() "keyAltNames" option
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-decrypt-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::decrypt()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_server_storage_engine('wiredTiger'); ?>
89
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
910
--FILE--

tests/clientEncryption/clientEncryption-deleteKey-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::deleteKey()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-deleteKey-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::deleteKey() when key does not exist
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-encrypt-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::encrypt()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_server_storage_engine('wiredTiger'); ?>
89
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
910
--FILE--

tests/clientEncryption/clientEncryption-getKey-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::getKey()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-getKey-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::getKey() when key does not exist
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-getKeyByAltName-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::getKeyByAltName()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-getKeyByAltName-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::getKeyByAltName() when key does not exist
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-getKeys-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::getKeys()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-getKeys-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::getKeys() with empty key vault
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-getKeys-003.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::getKeys() cursor debug info
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-removeKeyAltName-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::removeKeyAltName()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-removeKeyAltName-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::removeKeyAltName() when key does not exist
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-removeKeyAltName-003.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::removeKeyAltName() when keyAltName does not exi
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-rewrapManyDataKey-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::rewrapManyDataKey()
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

tests/clientEncryption/clientEncryption-rewrapManyDataKey-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\ClientEncryption::rewrapManyDataKey() when filter matches no keys
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
7+
<?php skip_if_server_version('<', '4.2'); ?>
78
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php

0 commit comments

Comments
 (0)