diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-10-03 09:33:29 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-10-03 09:33:29 -0700 |
| commit | eebb129fd39c050a9d3b325fcd89df8aadb09218 (patch) | |
| tree | 8fd46cd5b59259166c25d16000eec49c34829332 /test/core/end2end | |
| parent | 7e405b19328dd4ebe9bc8ddf91ef0d1dc3dd5632 (diff) | |
| parent | ecc5a40bd32a5f633d158496a0291b4081c70849 (diff) | |
Merge branch 'master' into uv_core_transport
Diffstat (limited to 'test/core/end2end')
| -rw-r--r-- | test/core/end2end/fixtures/h2_fd.c | 2 | ||||
| -rwxr-xr-x | test/core/end2end/gen_build_yaml.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/fixtures/h2_fd.c b/test/core/end2end/fixtures/h2_fd.c index 85be079062..0eaf042aa2 100644 --- a/test/core/end2end/fixtures/h2_fd.c +++ b/test/core/end2end/fixtures/h2_fd.c @@ -100,7 +100,7 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - grpc_server_add_insecure_channel_from_fd(f->server, f->cq, sfd->fd_pair[1]); + grpc_server_add_insecure_channel_from_fd(f->server, NULL, sfd->fd_pair[1]); grpc_exec_ctx_finish(&exec_ctx); } diff --git a/test/core/end2end/gen_build_yaml.py b/test/core/end2end/gen_build_yaml.py index 71fe18453c..c2040c00d8 100755 --- a/test/core/end2end/gen_build_yaml.py +++ b/test/core/end2end/gen_build_yaml.py @@ -280,7 +280,7 @@ def main(): ) } print yaml.dump(json) -p + if __name__ == '__main__': main() |