Fixes

1 files changed, 4 insertions, 10 deletions

diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c
index be8132bc96..d0279e79ba 100644
--- a/test/core/end2end/fixtures/h2_sockpair+trace.c
+++ b/test/core/end2end/fixtures/h2_sockpair+trace.c
@@ -54,8 +54,6 @@
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
-grpc_workqueue *g_workqueue;
-
 /* chttp2 transport that is immediately available (used for testing
    connected_channel without a client_channel */
 
@@ -67,7 +65,7 @@ static void server_setup_transport(void *ts, grpc_transport *transport,
   grpc_call_list call_list = GRPC_CALL_LIST_INIT;
   grpc_server_setup_transport(
       f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx,
-      g_workqueue, grpc_server_get_channel_args(f->server), &call_list);
+      grpc_server_get_channel_args(f->server), &call_list);
   grpc_call_list_run(&call_list);
 }
 
@@ -85,9 +83,9 @@ static void client_setup_transport(void *ts, grpc_transport *transport,
                                           &grpc_compress_filter,
                                           &grpc_connected_channel_filter};
   size_t nfilters = sizeof(filters) / sizeof(*filters);
-  grpc_channel *channel = grpc_channel_create_from_filters(
-      "socketpair-target", filters, nfilters, cs->client_args, mdctx,
-      g_workqueue, 1, call_list);
+  grpc_channel *channel =
+      grpc_channel_create_from_filters("socketpair-target", filters, nfilters,
+                                       cs->client_args, mdctx, 1, call_list);
 
   cs->f->client = channel;
 
@@ -169,7 +167,6 @@ int main(int argc, char **argv) {
 
   grpc_test_init(argc, argv);
   grpc_init();
-  g_workqueue = grpc_workqueue_create(&call_list);
   grpc_call_list_run(&call_list);
 
   GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0));
@@ -180,9 +177,6 @@ int main(int argc, char **argv) {
     grpc_end2end_tests(configs[i]);
   }
 
-  grpc_workqueue_flush(g_workqueue, &call_list);
-  GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy", &call_list);
-  grpc_call_list_run(&call_list);
   grpc_shutdown();
 
   return 0;