Skip to content

Commit 8428734

Browse files
committed
Clean keyvault collection before CSFLE tests
1 parent 104b2f8 commit 8428734

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

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_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
78
--FILE--
89
<?php
910

tests/clientEncryption/clientEncryption-decrypt-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ MongoDB\Driver\ClientEncryption::decrypt()
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
77
<?php skip_if_not_server_storage_engine('wiredTiger'); ?>
8+
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php
1011

tests/clientEncryption/clientEncryption-encrypt-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ MongoDB\Driver\ClientEncryption::encrypt()
55
<?php skip_if_not_libmongocrypt(); ?>
66
<?php skip_if_not_live(); ?>
77
<?php skip_if_not_server_storage_engine('wiredTiger'); ?>
8+
<?php skip_if_not_clean(CSFLE_KEY_VAULT_DATABASE_NAME, CSFLE_KEY_VAULT_COLLECTION_NAME);
89
--FILE--
910
<?php
1011

tests/utils/basic.inc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ define('DATABASE_NAME', getenv('MONGODB_DATABASE') ?: 'phongo');
88
define('COLLECTION_NAME', makeCollectionNameFromFilename($_SERVER['SCRIPT_FILENAME']));
99
define('NS', DATABASE_NAME . '.' . COLLECTION_NAME);
1010
define('SSL_DIR', realpath(getenv('SSL_DIR')));
11-
define('CSFLE_KEY_VAULT_NS', 'encryption.__keyVault');
11+
define('CSFLE_KEY_VAULT_DATABASE_NAME', 'encryption');
12+
define('CSFLE_KEY_VAULT_COLLECTION_NAME', '__keyVault');
13+
define('CSFLE_KEY_VAULT_NS', CSFLE_KEY_VAULT_DATABASE_NAME . '.' . CSFLE_KEY_VAULT_COLLECTION_NAME);
1214
define('CSFLE_LOCAL_KEY', base64_decode('Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk'));

0 commit comments

Comments
 (0)