aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/security
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-09-22 10:54:34 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-09-22 10:54:34 -0700
commitf5768a6765cae20477f36b346ce18bfb44fe2e25 (patch)
tree786f7bbc9f7b572f02c385c15bd22ccbb1ea2b99 /test/core/security
parent098047b53abfb3142b0dc9eca83564cd565902b7 (diff)
Rename init
Diffstat (limited to 'test/core/security')
-rw-r--r--test/core/security/credentials_test.c24
-rw-r--r--test/core/security/jwt_verifier_test.c14
-rw-r--r--test/core/security/oauth2_utils.c2
-rw-r--r--test/core/security/print_google_default_creds_token.c2
-rw-r--r--test/core/security/secure_endpoint_test.c6
-rw-r--r--test/core/security/verify_jwt.c2
6 files changed, 25 insertions, 25 deletions
diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c
index 5e5b69f16c..2a50935c97 100644
--- a/test/core/security/credentials_test.c
+++ b/test/core/security/credentials_test.c
@@ -303,7 +303,7 @@ check_google_iam_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_crede
static void
test_google_iam_creds (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *creds = grpc_google_iam_credentials_create (test_google_iam_authorization_token, test_google_iam_authority_selector,
NULL);
GPR_ASSERT (grpc_credentials_has_request_metadata (creds));
@@ -326,7 +326,7 @@ check_access_token_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_cre
static void
test_access_token_creds (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *creds = grpc_access_token_credentials_create ("blah", NULL);
GPR_ASSERT (grpc_credentials_has_request_metadata (creds));
GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds));
@@ -351,7 +351,7 @@ check_ssl_oauth2_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data,
static void
test_ssl_oauth2_composite_creds (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL);
const grpc_credentials_array *creds_array;
grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", test_oauth2_bearer_token, 0);
@@ -401,7 +401,7 @@ check_ssl_oauth2_google_iam_composite_metadata (grpc_exec_ctx * exec_ctx, void *
static void
test_ssl_oauth2_google_iam_composite_creds (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *ssl_creds = grpc_ssl_credentials_create (test_root_cert, NULL, NULL);
const grpc_credentials_array *creds_array;
grpc_credentials *oauth2_creds = grpc_md_only_test_credentials_create ("Authorization", test_oauth2_bearer_token, 0);
@@ -491,7 +491,7 @@ httpcli_get_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_r
static void
test_compute_engine_creds_success (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create (NULL);
GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds));
GPR_ASSERT (grpc_credentials_has_request_metadata_only (compute_engine_creds));
@@ -513,7 +513,7 @@ test_compute_engine_creds_success (void)
static void
test_compute_engine_creds_failure (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *compute_engine_creds = grpc_google_compute_engine_credentials_create (NULL);
grpc_httpcli_set_override (compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called);
GPR_ASSERT (grpc_credentials_has_request_metadata (compute_engine_creds));
@@ -564,7 +564,7 @@ refresh_token_httpcli_post_failure (grpc_exec_ctx * exec_ctx, const grpc_httpcli
static void
test_refresh_token_creds_success (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create (test_refresh_token_str,
NULL);
GPR_ASSERT (grpc_credentials_has_request_metadata (refresh_token_creds));
@@ -588,7 +588,7 @@ test_refresh_token_creds_success (void)
static void
test_refresh_token_creds_failure (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *refresh_token_creds = grpc_google_refresh_token_credentials_create (test_refresh_token_str,
NULL);
grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_failure);
@@ -662,7 +662,7 @@ static void
test_jwt_creds_success (void)
{
char *json_key_string = test_json_key_str ();
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create (json_key_string, grpc_max_auth_token_lifetime, NULL);
GPR_ASSERT (grpc_credentials_has_request_metadata (jwt_creds));
GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds));
@@ -692,7 +692,7 @@ static void
test_jwt_creds_signing_failure (void)
{
char *json_key_string = test_json_key_str ();
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_credentials *jwt_creds = grpc_service_account_jwt_access_credentials_create (json_key_string, grpc_max_auth_token_lifetime, NULL);
GPR_ASSERT (grpc_credentials_has_request_metadata (jwt_creds));
GPR_ASSERT (grpc_credentials_has_request_metadata_only (jwt_creds));
@@ -846,7 +846,7 @@ test_metadata_plugin_success (void)
grpc_credentials *creds;
plugin_state state = PLUGIN_INITIAL_STATE;
grpc_metadata_credentials_plugin plugin;
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
plugin.state = &state;
plugin.get_metadata = plugin_get_metadata_success;
@@ -867,7 +867,7 @@ test_metadata_plugin_failure (void)
grpc_credentials *creds;
plugin_state state = PLUGIN_INITIAL_STATE;
grpc_metadata_credentials_plugin plugin;
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
plugin.state = &state;
plugin.get_metadata = plugin_get_metadata_failure;
diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c
index 2883cf858b..94fa78d2b3 100644
--- a/test/core/security/jwt_verifier_test.c
+++ b/test/core/security/jwt_verifier_test.c
@@ -221,7 +221,7 @@ on_verification_success (void *user_data, grpc_jwt_verifier_status status, grpc_
static void
test_jwt_verifier_google_email_issuer_success (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0);
char *jwt = NULL;
char *key_str = json_key_str (json_key_str_part3_for_google_email_issuer);
@@ -254,7 +254,7 @@ httpcli_get_custom_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_
static void
test_jwt_verifier_custom_email_issuer_success (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (&custom_mapping, 1);
char *jwt = NULL;
char *key_str = json_key_str (json_key_str_part3_for_custom_email_issuer);
@@ -300,7 +300,7 @@ httpcli_get_openid_config (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request
static void
test_jwt_verifier_url_issuer_success (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0);
char *jwt = NULL;
char *key_str = json_key_str (json_key_str_part3_for_url_issuer);
@@ -339,7 +339,7 @@ httpcli_get_bad_json (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * req
static void
test_jwt_verifier_url_issuer_bad_config (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0);
char *jwt = NULL;
char *key_str = json_key_str (json_key_str_part3_for_url_issuer);
@@ -360,7 +360,7 @@ test_jwt_verifier_url_issuer_bad_config (void)
static void
test_jwt_verifier_bad_json_key (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0);
char *jwt = NULL;
char *key_str = json_key_str (json_key_str_part3_for_google_email_issuer);
@@ -407,7 +407,7 @@ on_verification_bad_signature (void *user_data, grpc_jwt_verifier_status status,
static void
test_jwt_verifier_bad_signature (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0);
char *jwt = NULL;
char *key_str = json_key_str (json_key_str_part3_for_url_issuer);
@@ -444,7 +444,7 @@ on_verification_bad_format (void *user_data, grpc_jwt_verifier_status status, gr
static void
test_jwt_verifier_bad_format (void)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_jwt_verifier *verifier = grpc_jwt_verifier_create (NULL, 0);
grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called);
grpc_jwt_verifier_verify (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (void *) expected_user_data, &closure_list);
diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c
index f096fa9ca8..3b8f3a2b85 100644
--- a/test/core/security/oauth2_utils.c
+++ b/test/core/security/oauth2_utils.c
@@ -85,7 +85,7 @@ char *
grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds)
{
oauth2_request request;
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_closure do_nothing_closure;
grpc_pollset_init (&request.pollset);
request.is_done = 0;
diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c
index 51a0968a20..143359fea4 100644
--- a/test/core/security/print_google_default_creds_token.c
+++ b/test/core/security/print_google_default_creds_token.c
@@ -76,7 +76,7 @@ int
main (int argc, char **argv)
{
int result = 0;
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
synchronizer sync;
grpc_credentials *creds = NULL;
char *service_url = "https://test.foo.google.com/Foo";
diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c
index bd760320cc..581f671ee9 100644
--- a/test/core/security/secure_endpoint_test.c
+++ b/test/core/security/secure_endpoint_test.c
@@ -50,7 +50,7 @@ static grpc_pollset g_pollset;
static grpc_endpoint_test_fixture
secure_endpoint_create_fixture_tcp_socketpair (size_t slice_size, gpr_slice * leftover_slices, size_t leftover_nslices)
{
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
tsi_frame_protector *fake_read_protector = tsi_create_fake_protector (NULL);
tsi_frame_protector *fake_write_protector = tsi_create_fake_protector (NULL);
grpc_endpoint_test_fixture f;
@@ -154,7 +154,7 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size)
grpc_endpoint_test_fixture f = config.create_fixture (slice_size);
gpr_slice_buffer incoming;
gpr_slice s = gpr_slice_from_copied_string ("hello world 12345678900987654321");
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
int n = 0;
grpc_closure done_closure;
gpr_log (GPR_INFO, "Start test left over");
@@ -188,7 +188,7 @@ int
main (int argc, char **argv)
{
grpc_closure destroyed;
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_test_init (argc, argv);
grpc_init ();
diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c
index d7d261299e..8b35c712cc 100644
--- a/test/core/security/verify_jwt.c
+++ b/test/core/security/verify_jwt.c
@@ -95,7 +95,7 @@ main (int argc, char **argv)
gpr_cmdline *cl;
char *jwt = NULL;
char *aud = NULL;
- grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
cl = gpr_cmdline_create ("JWT verifier tool");
gpr_cmdline_add_string (cl, "jwt", "JSON web token to verify", &jwt);