From 2757fa8b3967b3dbbf75782d59d284cf2f7cd3ca Mon Sep 17 00:00:00 2001
From: Julien Boeuf <jboeuf@google.com>
Date: Fri, 29 Jan 2016 22:13:24 -0800
Subject: [PATCH] fixing test and clang-format.
---
include/grpc/grpc_security.h | 1 -
test/core/security/security_connector_test.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h
index e280bf5391..118637caeb 100644
--- a/include/grpc/grpc_security.h
+++ b/include/grpc/grpc_security.h
@@ -150,7 +150,6 @@ typedef enum {
GRPC_SSL_ROOTS_OVERRIDE_FAIL
} grpc_ssl_roots_override_result;
-
/* Callback for getting the SSL roots override from the application.
In case of success, *pem_roots_certs must be set to a NULL terminated string
containing the list of PEM encoded root certificates. The ownership is passed
diff --git a/test/core/security/security_connector_test.c b/test/core/security/security_connector_test.c
index d9322f0257..ee5435f01d 100644
--- a/test/core/security/security_connector_test.c
+++ b/test/core/security/security_connector_test.c
@@ -323,7 +323,9 @@ static void test_default_ssl_roots(void) {
fwrite(roots_for_env_var, 1, strlen(roots_for_env_var), roots_env_var_file);
fclose(roots_env_var_file);
- /* First let's get the root through the override (no env are set). */
+ /* First let's get the root through the override: set the env to an invalid
+ value. */
+ gpr_setenv(GRPC_DEFAULT_SSL_ROOTS_FILE_PATH_ENV_VAR, "");
grpc_set_ssl_roots_override_callback(override_roots_success);
gpr_slice roots = grpc_get_default_ssl_roots_for_testing();
char *roots_contents = gpr_dump_slice(roots, GPR_DUMP_ASCII);
--
GitLab