diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-01-09 14:58:12 -0800 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-01-09 14:58:12 -0800 |
| commit | e93b028f07addb13240e636aaea837e3f0eaa9c4 (patch) | |
| tree | 2c0c502c9ca42413c1d87210cfe9cedcb7b2bcef /test/cpp | |
| parent | d191d31e4963b23255840ffe648290ab92d5e8bc (diff) | |
| parent | 6cf58c81731343e0ffb134febd3e576425399e5e (diff) | |
Merge branch 'master' into tweak_slice_buffer
Diffstat (limited to 'test/cpp')
| -rw-r--r-- | test/cpp/common/channel_arguments_test.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/test/cpp/common/channel_arguments_test.cc b/test/cpp/common/channel_arguments_test.cc index 60d3215265..190d32ce06 100644 --- a/test/cpp/common/channel_arguments_test.cc +++ b/test/cpp/common/channel_arguments_test.cc @@ -37,7 +37,11 @@ #include <grpc/grpc.h> #include <grpc/support/useful.h> #include <gtest/gtest.h> + +extern "C" { +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/socket_mutator.h" +} namespace grpc { namespace testing { @@ -228,7 +232,11 @@ TEST_F(ChannelArgumentsTest, SetSocketMutator) { EXPECT_FALSE(HasArg(arg0)); // arg0 is destroyed by grpc_socket_mutator_to_arg(mutator1) - arg1.value.pointer.vtable->destroy(arg1.value.pointer.p); + { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + arg1.value.pointer.vtable->destroy(&exec_ctx, arg1.value.pointer.p); + grpc_exec_ctx_finish(&exec_ctx); + } } TEST_F(ChannelArgumentsTest, SetUserAgentPrefix) { |