aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/http
diff options
context:
space:
mode:
authorGravatar Yash Tibrewal <yashkt@google.com>2017-11-28 18:06:23 -0800
committerGravatar Yash Tibrewal <yashkt@google.com>2017-11-28 18:06:23 -0800
commit03412ee9de902e378bc4cea933397ebe5faddc29 (patch)
tree8976a958d4c9855481425452e578ab4a4e315ad0 /test/core/http
parent81fc8c9c336fab7a71b448f748a32d680301277c (diff)
Remove TLS_NO_SUPPORT and always use GPR_TLS. Reorder statements in grpc_init and grpc_shutdown. Add grpc_init and grpc_shutdown in failing test/cpp tests
Diffstat (limited to 'test/core/http')
-rw-r--r--test/core/http/httpscli_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc
index ee2bff18db..418afb6992 100644
--- a/test/core/http/httpscli_test.cc
+++ b/test/core/http/httpscli_test.cc
@@ -89,7 +89,7 @@ static void test_get(int port) {
"pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops),
&worker, n_seconds_time(1))));
gpr_mu_unlock(g_mu);
-
+ grpc_core::ExecCtx::Get()->Flush();
gpr_mu_lock(g_mu);
}
gpr_mu_unlock(g_mu);
@@ -129,7 +129,7 @@ static void test_post(int port) {
"pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops),
&worker, n_seconds_time(1))));
gpr_mu_unlock(g_mu);
-
+ grpc_core::ExecCtx::Get()->Flush();
gpr_mu_lock(g_mu);
}
gpr_mu_unlock(g_mu);
@@ -144,7 +144,6 @@ static void destroy_pops(void* p, grpc_error* error) {
int main(int argc, char** argv) {
grpc_closure destroyed;
- grpc_core::ExecCtx _local_exec_ctx;
gpr_subprocess* server;
char* me = argv[0];
char* lslash = strrchr(me, '/');
@@ -196,6 +195,7 @@ int main(int argc, char** argv) {
test_post(port);
{
+ grpc_core::ExecCtx _local_exec_ctx;
grpc_httpcli_context_destroy(&g_context);
GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops,
grpc_schedule_on_exec_ctx);