Cleanup

5 files changed, 56 insertions, 21 deletions

diff --git a/test/core/transport/chttp2/context_list_test.cc b/test/core/transport/chttp2/context_list_test.cc
index 1f7a38a107..3814184e16 100644
--- a/test/core/transport/chttp2/context_list_test.cc
+++ b/test/core/transport/chttp2/context_list_test.cc
@@ -18,12 +18,17 @@
 
 #include "src/core/lib/iomgr/port.h"
 
+#include <new>
+#include <vector>
+
+#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/context_list.h"
+#include "src/core/lib/transport/transport.h"
+#include "test/core/util/mock_endpoint.h"
+#include "test/core/util/test_config.h"
 
 #include <grpc/grpc.h>
 
-#include "test/core/util/test_config.h"
-
 static void TestExecuteFlushesListVerifier(void* arg,
                                            grpc_core::Timestamps* ts) {
   GPR_ASSERT(arg != nullptr);
@@ -31,6 +36,8 @@ static void TestExecuteFlushesListVerifier(void* arg,
   gpr_atm_rel_store(done, static_cast<gpr_atm>(1));
 }
 
+static void discard_write(grpc_slice slice) {}
+
 /** Tests that all ContextList elements in the list are flushed out on
  * execute.
  * Also tests that arg is passed correctly.
@@ -39,19 +46,41 @@ static void TestExecuteFlushesList() {
   grpc_core::ContextList* list = nullptr;
   grpc_http2_set_write_timestamps_callback(TestExecuteFlushesListVerifier);
 #define NUM_ELEM 5
-  grpc_chttp2_stream s[NUM_ELEM];
+  grpc_core::ExecCtx exec_ctx;
+  grpc_stream_refcount ref;
+  grpc_resource_quota* resource_quota =
+      grpc_resource_quota_create("context_list_test");
+  grpc_endpoint* mock_endpoint =
+      grpc_mock_endpoint_create(discard_write, resource_quota);
+  grpc_transport* t =
+      grpc_create_chttp2_transport(nullptr, mock_endpoint, true);
+  std::vector<grpc_chttp2_stream*> s;
+  s.reserve(NUM_ELEM);
   gpr_atm verifier_called[NUM_ELEM];
   for (auto i = 0; i < NUM_ELEM; i++) {
-    s[i].context = &verifier_called[i];
+    s.push_back(static_cast<grpc_chttp2_stream*>(
+        gpr_malloc(grpc_transport_stream_size(t))));
+    grpc_transport_init_stream(reinterpret_cast<grpc_transport*>(t),
+                               reinterpret_cast<grpc_stream*>(s[i]), &ref,
+                               nullptr, nullptr);
+    s[i]->context = &verifier_called[i];
     gpr_atm_rel_store(&verifier_called[i], static_cast<gpr_atm>(0));
-    grpc_core::ContextList::Append(&list, &s[i]);
+    grpc_core::ContextList::Append(&list, s[i]);
   }
   grpc_core::Timestamps ts;
   grpc_core::ContextList::Execute(list, &ts, GRPC_ERROR_NONE);
   for (auto i = 0; i < NUM_ELEM; i++) {
     GPR_ASSERT(gpr_atm_acq_load(&verifier_called[i]) ==
                static_cast<gpr_atm>(1));
+    grpc_transport_destroy_stream(reinterpret_cast<grpc_transport*>(t),
+                                  reinterpret_cast<grpc_stream*>(s[i]),
+                                  nullptr);
+    exec_ctx.Flush();
+    gpr_free(s[i]);
   }
+  grpc_transport_destroy(t);
+  grpc_resource_quota_unref(resource_quota);
+  exec_ctx.Flush();
 }
 
 static void TestContextList() { TestExecuteFlushesList(); }
diff --git a/test/core/util/mock_endpoint.cc b/test/core/util/mock_endpoint.cc
index 570edf18e5..e5867cd526 100644
--- a/test/core/util/mock_endpoint.cc
+++ b/test/core/util/mock_endpoint.cc
@@ -103,19 +103,19 @@ static grpc_resource_user* me_get_resource_user(grpc_endpoint* ep) {
 
 static int me_get_fd(grpc_endpoint* ep) { return -1; }
 
-static const grpc_endpoint_vtable vtable = {
-    me_read,
-    me_write,
-    me_add_to_pollset,
-    me_add_to_pollset_set,
-    me_delete_from_pollset_set,
-    me_shutdown,
-    me_destroy,
-    me_get_resource_user,
-    me_get_peer,
-    me_get_fd,
-    nullptr,
-};
+static bool me_can_track_err(grpc_endpoint* ep) { return false; }
+
+static const grpc_endpoint_vtable vtable = {me_read,
+                                            me_write,
+                                            me_add_to_pollset,
+                                            me_add_to_pollset_set,
+                                            me_delete_from_pollset_set,
+                                            me_shutdown,
+                                            me_destroy,
+                                            me_get_resource_user,
+                                            me_get_peer,
+                                            me_get_fd,
+                                            me_can_track_err};
 
 grpc_endpoint* grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice),
                                          grpc_resource_quota* resource_quota) {
diff --git a/test/core/util/passthru_endpoint.cc b/test/core/util/passthru_endpoint.cc
index 835a39394c..51b6de4695 100644
--- a/test/core/util/passthru_endpoint.cc
+++ b/test/core/util/passthru_endpoint.cc
@@ -155,6 +155,8 @@ static char* me_get_peer(grpc_endpoint* ep) {
 
 static int me_get_fd(grpc_endpoint* ep) { return -1; }
 
+static bool me_can_track_err(grpc_endpoint* ep) { return false; }
+
 static grpc_resource_user* me_get_resource_user(grpc_endpoint* ep) {
   half* m = reinterpret_cast<half*>(ep);
   return m->resource_user;
@@ -171,7 +173,7 @@ static const grpc_endpoint_vtable vtable = {
     me_get_resource_user,
     me_get_peer,
     me_get_fd,
-    nullptr,
+    me_can_track_err,
 };
 
 static void half_init(half* m, passthru_endpoint* parent,
diff --git a/test/core/util/trickle_endpoint.cc b/test/core/util/trickle_endpoint.cc
index 8d93db05e6..b0da735e57 100644
--- a/test/core/util/trickle_endpoint.cc
+++ b/test/core/util/trickle_endpoint.cc
@@ -131,6 +131,8 @@ static int te_get_fd(grpc_endpoint* ep) {
   return grpc_endpoint_get_fd(te->wrapped);
 }
 
+static bool te_can_track_err(grpc_endpoint* ep) { return false; }
+
 static void te_finish_write(void* arg, grpc_error* error) {
   trickle_endpoint* te = static_cast<trickle_endpoint*>(arg);
   gpr_mu_lock(&te->mu);
@@ -149,7 +151,7 @@ static const grpc_endpoint_vtable vtable = {te_read,
                                             te_get_resource_user,
                                             te_get_peer,
                                             te_get_fd,
-                                            nullptr};
+                                            te_can_track_err};
 
 grpc_endpoint* grpc_trickle_endpoint_create(grpc_endpoint* wrap,
                                             double bytes_per_second) {
diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc
index f7ae16e61d..650152ecc0 100644
--- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc
+++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc
@@ -54,7 +54,8 @@ class DummyEndpoint : public grpc_endpoint {
                                                    destroy,
                                                    get_resource_user,
                                                    get_peer,
-                                                   get_fd};
+                                                   get_fd,
+                                                   can_track_err};
     grpc_endpoint::vtable = &my_vtable;
     ru_ = grpc_resource_user_create(Library::get().rq(), "dummy_endpoint");
   }
@@ -125,6 +126,7 @@ class DummyEndpoint : public grpc_endpoint {
   }
   static char* get_peer(grpc_endpoint* ep) { return gpr_strdup("test"); }
   static int get_fd(grpc_endpoint* ep) { return 0; }
+  static bool can_track_err(grpc_endpoint* ep) { return false; }
 };
 
 class Fixture {