-
Notifications
You must be signed in to change notification settings - Fork 455
CDRIVER-5901 support auto encryption in unified tests #2004
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.
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
Conversation
Co-authored-by: Kevin Albertson <[email protected]>
src/libmongoc/tests/json/client_side_encryption/unified/fle2v2-BypassQueryAnalysis.json
Outdated
Show resolved
Hide resolved
src/libmongoc/tests/json/client_side_encryption/unified/maxWireVersion.json
Show resolved
Hide resolved
Co-authored-by: Ezra Chung <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Aside from addressing ClangFormat issues, LGTM.
I suspect EVG tasks are currently failing due to DRIVERS-3188, not due to changes in this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On second look, I think some test task failures may be introduced in this PR. For example asan-sasl-cyrus-openssl-ubuntu2004-clang-test-latest-sharded-auth is failing with:
error: missing required environment variable 'MONGOC_TEST_AWS_ACCESS_KEY_ID'
I expect that task is not intended to run client side encryption tests (e.g. tasks named *-cse-*
run client side encryption tests). The unified tests may need to be conditioned on test_framework_skip_if_no_client_side_encryption
:
diff --git a/src/libmongoc/tests/unified/runner.c b/src/libmongoc/tests/unified/runner.c
index b049d464ef..81b052e544 100644
--- a/src/libmongoc/tests/unified/runner.c
+++ b/src/libmongoc/tests/unified/runner.c
@@ -794,6 +794,11 @@ check_run_on_requirement (test_runner_t *test_runner,
return false;
}
+ if (0 == test_framework_skip_if_no_client_side_encryption ()) {
+ *fail_reason = bson_strdup_printf ("CSFLE is required but not all environment variables are set");
+ return false;
+ }
+
if (csfle_required) {
continue;
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM (assuming expected tests pass).
Evergreen: https://spruce.mongodb.com/version/6827b7ca805919000708843e