Skip to content

Merge v1.x into v2.x #1538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Merge v1.x into v2.x #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/SpecTests/ClientSideEncryptionSpecTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ class ClientSideEncryptionSpecTest extends FunctionalTestCase
'timeoutMS: remaining timeoutMS applied to find to get keyvault data' => 'Not yet implemented (PHPC-1760)',
'namedKMS: Automatically encrypt and decrypt with a named KMS provider' => 'Not yet implemented (PHPLIB-1328)',
'fle2v2-Compact: Compact works' => 'Failing due to bug in libmongocrypt (LIBMONGOCRYPT-699)',
'keyCache: Insert with deterministic encryption, then find it' => 'Wait operation not supported (PHPLIB-1496)',
];

private static string $specDir = __DIR__ . '/../specifications/source/client-side-encryption';
Expand Down
2 changes: 1 addition & 1 deletion tests/specifications
Open in desktop
Submodule specifications updated 16 files
+2 −0 source/client-side-encryption/client-side-encryption.md
+69 −0 source/client-side-encryption/etc/test-templates/keyCache.yml.template
+1 −1 source/client-side-encryption/tests/benchmarks.md
+270 −0 source/client-side-encryption/tests/legacy/keyCache.json
+69 −0 source/client-side-encryption/tests/legacy/keyCache.yml
+198 −0 source/client-side-encryption/tests/unified/keyCache.json
+85 −0 source/client-side-encryption/tests/unified/keyCache.yml
+0 −5 source/transactions-convenient-api/tests/unified/commit-retry.json
+0 −3 source/transactions-convenient-api/tests/unified/commit-retry.yml
+1 −16 source/transactions-convenient-api/tests/unified/commit-writeconcernerror.json
+1 −10 source/transactions-convenient-api/tests/unified/commit-writeconcernerror.yml
+0 −5 source/transactions/tests/unified/retryable-commit.json
+0 −3 source/transactions/tests/unified/retryable-commit.yml
+1,119 −0 source/unified-test-format/schema-1.22.json
+1 −1 source/unified-test-format/tests/Makefile
+6 −0 source/unified-test-format/unified-test-format.md