Initial refactoring of a few tests

src/core/security/credentials.h

@@ -105,7 +105,6 @@ typedef struct {
       grpc_credentials *c, const char *target, const grpc_channel_args *args,
       grpc_credentials *request_metadata_creds,
       grpc_channel_security_connector **sc, grpc_channel_args **new_args);
-
 } grpc_credentials_vtable;
 
 struct grpc_credentials {

test/core/httpcli/httpcli_test.c

@@ -40,7 +40,10 @@
 #include <grpc/support/sync.h>
 #include "test/core/util/test_config.h"
 
-static gpr_event g_done;
+static gpr_mu g_mu;
+static int g_done = 0;
+static grpc_pollset_set g_pollset_set;
+static grpc_pollset g_pollset;
 
 static gpr_timespec n_seconds_time(int seconds) {
   return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(seconds);
@@ -50,22 +53,28 @@ static void on_finish(void *arg, const grpc_httpcli_response *response) {
   GPR_ASSERT(arg == (void *)42);
   GPR_ASSERT(response);
   GPR_ASSERT(response->status == 200);
-  gpr_event_set(&g_done, (void *)1);
+  gpr_mu_lock(&g_mu);
+  g_done = 1;
+  gpr_mu_unlock(&g_mu);
 }
 
 static void test_get(int use_ssl) {
   grpc_httpcli_request req;
 
+  g_done = 0;
   gpr_log(GPR_INFO, "running %s with use_ssl=%d.", __FUNCTION__, use_ssl);
 
-  gpr_event_init(&g_done);
   memset(&req, 0, sizeof(req));
   req.host = "www.google.com";
   req.path = "/";
   req.use_ssl = use_ssl;
 
-  grpc_httpcli_get(&req, n_seconds_time(15), on_finish, (void *)42);
-  GPR_ASSERT(gpr_event_wait(&g_done, n_seconds_time(20)));
+  grpc_httpcli_get(&req, n_seconds_time(15), &g_pollset_set, on_finish, (void *)42);
+  gpr_mu_lock(&g_mu);
+  while (!g_done) {
+    grpc_pollset_work(&g_pollset, n_seconds_time(20));
+  }
+  gpr_mu_unlock(&g_mu);
 }
 
 /*
@@ -89,6 +98,10 @@ static void test_post(int use_ssl) {
 int main(int argc, char **argv) {
   grpc_test_init(argc, argv);
   grpc_iomgr_init();
+  grpc_pollset_set_init(&g_pollset_set);
+  grpc_pollset_init(&g_pollset);
+  gpr_mu_init(&g_mu);
+  grpc_pollset_set_add_pollset(&g_pollset_set, &g_pollset);
 
   test_get(0);
   test_get(1);
@@ -96,7 +109,10 @@ int main(int argc, char **argv) {
   /* test_post(0); */
   /* test_post(1); */
 
+  grpc_pollset_set_destroy(&g_pollset_set);
+  grpc_pollset_destroy(&g_pollset);
   grpc_iomgr_shutdown();
+  gpr_mu_destroy(&g_mu);
 
   return 0;
 }

test/core/iomgr/tcp_client_posix_test.c

@@ -45,6 +45,9 @@
 #include <grpc/support/time.h>
 #include "test/core/util/test_config.h"
 
+static grpc_pollset_set g_pollset_set;
+static grpc_pollset g_pollset;
+
 static gpr_timespec test_deadline(void) {
   return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10);
 }
@@ -81,7 +84,7 @@ void test_succeeds(void) {
 
   /* connect to it */
   GPR_ASSERT(getsockname(svr_fd, (struct sockaddr *)&addr, &addr_len) == 0);
-  grpc_tcp_client_connect(must_succeed, &ev, (struct sockaddr *)&addr, addr_len,
+  grpc_tcp_client_connect(must_succeed, &ev, &g_pollset_set, (struct sockaddr *)&addr, addr_len,
                           gpr_inf_future);
 
   /* await the connection */
@@ -107,7 +110,7 @@ void test_fails(void) {
   addr.sin_family = AF_INET;
 
   /* connect to a broken address */
-  grpc_tcp_client_connect(must_fail, &ev, (struct sockaddr *)&addr, addr_len,
+  grpc_tcp_client_connect(must_fail, &ev, &g_pollset_set, (struct sockaddr *)&addr, addr_len,
                           gpr_inf_future);
 
   /* wait for the connection callback to finish */
@@ -153,7 +156,7 @@ void test_times_out(void) {
 
   connect_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1);
 
-  grpc_tcp_client_connect(must_fail, &ev, (struct sockaddr *)&addr, addr_len,
+  grpc_tcp_client_connect(must_fail, &ev, &g_pollset_set, (struct sockaddr *)&addr, addr_len,
                           connect_deadline);
   /* Make sure the event doesn't trigger early */
   GPR_ASSERT(!gpr_event_wait(&ev, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(500)));
@@ -171,10 +174,15 @@ void test_times_out(void) {
 int main(int argc, char **argv) {
   grpc_test_init(argc, argv);
   grpc_iomgr_init();
+  grpc_pollset_set_init(&g_pollset_set);
+  grpc_pollset_init(&g_pollset);
+  grpc_pollset_set_add_pollset(&g_pollset_set, &g_pollset);
   test_succeeds();
   gpr_log(GPR_ERROR, "End of first test");
   test_fails();
   test_times_out();
+  grpc_pollset_set_destroy(&g_pollset_set);
+  grpc_pollset_destroy(&g_pollset);
   grpc_iomgr_shutdown();
   return 0;
 }