Skip to content
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

DRIVERS-2781 increase wait time. #1740

Merged
merged 3 commits into from
Dec 4, 2024
Merged

DRIVERS-2781 increase wait time. #1740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82f27f4
DRIVERS-2781 increase "wait" time
kevinAlbs Dec 4, 2024
c85f96a
regenerate tests
kevinAlbs Dec 4, 2024
99fcb8e
clarify meaning of 0
kevinAlbs Dec 4, 2024
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
4 changes: 2 additions & 2 deletions source/client-side-encryption/client-side-encryption.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ class AutoEncryptionOpts {
// Set bypassQueryAnalysis to true to use explicit encryption on indexed fields
// without the MongoDB Enterprise Advanced licensed crypt_shared library.
bypassQueryAnalysis: Optional<Boolean>; // Default false.
keyExpirationMS: Optional<Uint64>; // Default 60000.
keyExpirationMS: Optional<Uint64>; // Default 60000. 0 means "never expire".
}
```

Expand Down Expand Up @@ -1049,7 +1049,7 @@ interface ClientEncryptionOpts {
keyVaultNamespace: String;
kmsProviders: KMSProviders;
tlsOptions?: KMSProvidersTLSOptions; // Maps KMS provider to TLS options.
keyExpirationMS: Optional<Uint64>; // Default 60000.
keyExpirationMS: Optional<Uint64>; // Default 60000. 0 means "never expire".
};

interface KMSProvidersTLSOptions {
Expand Down
4 changes: 2 additions & 2 deletions source/client-side-encryption/etc/test-templates/keyCache.yml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tests:
- name: wait
object: testRunner
arguments:
ms: 2
ms: 50 # Wait long enough to account for coarse time resolution on Windows (CDRIVER-4526).
- name: find
arguments:
filter: { _id: 1 }
Expand Down Expand Up @@ -66,4 +66,4 @@ tests:
collection:
# Outcome is checked using a separate MongoClient without auto encryption.
data:
- *doc0_encrypted
- *doc0_encrypted
2 changes: 1 addition & 1 deletion source/client-side-encryption/tests/legacy/keyCache.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion source/client-side-encryption/tests/legacy/keyCache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tests:
- name: wait
object: testRunner
arguments:
ms: 2
ms: 50 # Wait long enough to account for coarse time resolution on Windows (CDRIVER-4526).
- name: find
arguments:
filter: { _id: 1 }
Expand Down
2 changes: 1 addition & 1 deletion source/client-side-encryption/tests/unified/keyCache.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions source/client-side-encryption/tests/unified/keyCache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ tests:
- name: wait
object: testRunner
arguments:
ms: 2
ms: 50 # Wait long enough to account for coarse time resolution on Windows (CDRIVER-4526).
- name: decrypt
object: *clientEncryption0
arguments:
Expand All @@ -82,4 +82,4 @@ tests:
find: datakeys
filter: {"$or": [{"_id": {"$in": [ {'$binary': {'base64': 'a+YWzdygTAG62/cNUkqZiQ==', 'subType': '04'}} ] }}, {"keyAltNames": {"$in": []}}]}
$db: keyvault
readConcern: { level: "majority" }
readConcern: { level: "majority" }
Loading