Skip to content

Commit bd357f9

Browse files
yashyktyashykt
authored
Remove shutdown_cq from grpc_end2end_test_fixture (grpc#29049)
* Remove some shutdown_cq instances * Remove shutdown_cq from grpc_end2end_test_fixture
1 parent 6ba9988 commit bd357f9

File tree

119 files changed

+509
-565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+509
-565
lines changed

‎test/core/end2end/dualstack_socket_test.cc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ void test_connect(const char* server_host, const char* client_host, int port,
7878
grpc_channel* client;
7979
grpc_server* server;
8080
grpc_completion_queue* cq;
81-
grpc_completion_queue* shutdown_cq;
8281
grpc_call* c;
8382
grpc_call* s;
8483
cq_verifier* cqv;
@@ -257,14 +256,14 @@ void test_connect(const char* server_host, const char* client_host, int port,
257256
grpc_channel_destroy(client);
258257

259258
/* Destroy server. */
260-
shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
261-
grpc_server_shutdown_and_notify(server, shutdown_cq, tag(1000));
262-
GPR_ASSERT(grpc_completion_queue_pluck(shutdown_cq, tag(1000),
263-
grpc_timeout_seconds_to_deadline(5),
264-
nullptr)
265-
.type == GRPC_OP_COMPLETE);
259+
grpc_server_shutdown_and_notify(server, cq, tag(1000));
260+
grpc_event ev;
261+
do {
262+
ev = grpc_completion_queue_next(cq, grpc_timeout_seconds_to_deadline(5),
263+
nullptr);
264+
} while (ev.type != GRPC_OP_COMPLETE || ev.tag != tag(1000));
265+
266266
grpc_server_destroy(server);
267-
grpc_completion_queue_destroy(shutdown_cq);
268267
grpc_completion_queue_shutdown(cq);
269268
drain_cq(cq);
270269
grpc_completion_queue_destroy(cq);

‎test/core/end2end/end2end_tests.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ typedef struct grpc_end2end_test_config grpc_end2end_test_config;
4545

4646
struct grpc_end2end_test_fixture {
4747
grpc_completion_queue* cq;
48-
grpc_completion_queue* shutdown_cq;
4948
grpc_server* server;
5049
grpc_channel* client;
5150
void* fixture_data;

‎test/core/end2end/fixtures/h2_census.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
5050

5151
f.fixture_data = ffd;
5252
f.cq = grpc_completion_queue_create_for_next(nullptr);
53-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
5453

5554
return f;
5655
}

‎test/core/end2end/fixtures/h2_compress.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack_compression(
5858
memset(&f, 0, sizeof(f));
5959
f.fixture_data = ffd;
6060
f.cq = grpc_completion_queue_create_for_next(nullptr);
61-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
6261

6362
return f;
6463
}

‎test/core/end2end/fixtures/h2_fakesec.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
4444

4545
f.fixture_data = ffd;
4646
f.cq = grpc_completion_queue_create_for_next(nullptr);
47-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
4847

4948
return f;
5049
}

‎test/core/end2end/fixtures/h2_fd.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair(
6161
memset(&f, 0, sizeof(f));
6262
f.fixture_data = fixture_data;
6363
f.cq = grpc_completion_queue_create_for_next(nullptr);
64-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
6564

6665
create_sockets(fixture_data->fd_pair);
6766

‎test/core/end2end/fixtures/h2_full+pipe.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
5656

5757
f.fixture_data = ffd;
5858
f.cq = grpc_completion_queue_create_for_next(nullptr);
59-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
6059

6160
return f;
6261
}

‎test/core/end2end/fixtures/h2_full+trace.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
5555

5656
f.fixture_data = ffd;
5757
f.cq = grpc_completion_queue_create_for_next(nullptr);
58-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
5958

6059
return f;
6160
}

‎test/core/end2end/fixtures/h2_full.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
5050

5151
f.fixture_data = ffd;
5252
f.cq = grpc_completion_queue_create_for_next(nullptr);
53-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
5453

5554
return f;
5655
}

‎test/core/end2end/fixtures/h2_http_proxy.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
6161

6262
f.fixture_data = ffd;
6363
f.cq = grpc_completion_queue_create_for_next(nullptr);
64-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
6564

6665
return f;
6766
}

‎test/core/end2end/fixtures/h2_insecure.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ grpc_end2end_test_fixture Chttp2CreateFixtureInsecureFullstack(
4545
ffd->localaddr = grpc_core::JoinHostPort("localhost", port);
4646
f.fixture_data = ffd;
4747
f.cq = grpc_completion_queue_create_for_next(nullptr);
48-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
4948

5049
return f;
5150
}

‎test/core/end2end/fixtures/h2_oauth2.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
106106
ffd->tls_version = tls_version;
107107
f.fixture_data = ffd;
108108
f.cq = grpc_completion_queue_create_for_next(nullptr);
109-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
110109
return f;
111110
}
112111

‎test/core/end2end/fixtures/h2_proxy.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
7171

7272
f.fixture_data = ffd;
7373
f.cq = grpc_completion_queue_create_for_next(nullptr);
74-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
7574

7675
return f;
7776
}

‎test/core/end2end/fixtures/h2_sockpair+trace.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair(
107107
memset(&f, 0, sizeof(f));
108108
f.fixture_data = fixture_data;
109109
f.cq = grpc_completion_queue_create_for_next(nullptr);
110-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
111110
fixture_data->ep = grpc_iomgr_create_endpoint_pair("fixture", nullptr);
112111
return f;
113112
}

‎test/core/end2end/fixtures/h2_sockpair.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair(
103103
memset(&f, 0, sizeof(f));
104104
f.fixture_data = fixture_data;
105105
f.cq = grpc_completion_queue_create_for_next(nullptr);
106-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
107106
fixture_data->ep = grpc_iomgr_create_endpoint_pair("fixture", nullptr);
108107
return f;
109108
}

‎test/core/end2end/fixtures/h2_sockpair_1byte.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair(
103103
memset(&f, 0, sizeof(f));
104104
f.fixture_data = fixture_data;
105105
f.cq = grpc_completion_queue_create_for_next(nullptr);
106-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
107106
grpc_arg a[3];
108107
a[0].key = const_cast<char*>(GRPC_ARG_TCP_READ_CHUNK_SIZE);
109108
a[0].type = GRPC_ARG_INTEGER;

‎test/core/end2end/fixtures/h2_ssl.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
5656

5757
f.fixture_data = ffd;
5858
f.cq = grpc_completion_queue_create_for_next(nullptr);
59-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
6059

6160
return f;
6261
}

‎test/core/end2end/fixtures/h2_ssl_cred_reload.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
9191

9292
f.fixture_data = ffd;
9393
f.cq = grpc_completion_queue_create_for_next(nullptr);
94-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
9594

9695
return f;
9796
}

‎test/core/end2end/fixtures/h2_ssl_proxy.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack(
9999

100100
f.fixture_data = ffd;
101101
f.cq = grpc_completion_queue_create_for_next(nullptr);
102-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
103102

104103
return f;
105104
}

‎test/core/end2end/fixtures/h2_tls.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_simple_fullstack(
186186
ffd, SecurityPrimitives::VerifierType::EXTERNAL_SYNC_VERIFIER);
187187
f.fixture_data = ffd;
188188
f.cq = grpc_completion_queue_create_for_next(nullptr);
189-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
190189
return f;
191190
}
192191

@@ -204,7 +203,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_async_verifier(
204203
ffd, SecurityPrimitives::VerifierType::EXTERNAL_ASYNC_VERIFIER);
205204
f.fixture_data = ffd;
206205
f.cq = grpc_completion_queue_create_for_next(nullptr);
207-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
208206
return f;
209207
}
210208

@@ -222,7 +220,6 @@ chttp2_create_fixture_hostname_verifier_cert_watcher(const grpc_channel_args*,
222220
SecurityPrimitives::VerifierType::HOSTNAME_VERIFIER);
223221
f.fixture_data = ffd;
224222
f.cq = grpc_completion_queue_create_for_next(nullptr);
225-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
226223
return f;
227224
}
228225

@@ -240,7 +237,6 @@ chttp2_create_fixture_async_verifier_cert_watcher(const grpc_channel_args*,
240237
ffd, SecurityPrimitives::VerifierType::EXTERNAL_ASYNC_VERIFIER);
241238
f.fixture_data = ffd;
242239
f.cq = grpc_completion_queue_create_for_next(nullptr);
243-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
244240
return f;
245241
}
246242

‎test/core/end2end/fixtures/h2_uds.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack_base(
5656
memset(&f, 0, sizeof(f));
5757
f.fixture_data = ffd;
5858
f.cq = grpc_completion_queue_create_for_next(nullptr);
59-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
6059

6160
return f;
6261
}

‎test/core/end2end/fixtures/inproc.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ static grpc_end2end_test_fixture inproc_create_fixture(
4646

4747
f.fixture_data = ffd;
4848
f.cq = grpc_completion_queue_create_for_next(nullptr);
49-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
5049

5150
return f;
5251
}

‎test/core/end2end/fixtures/local_util.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ grpc_end2end_test_fixture grpc_end2end_local_chttp2_create_fixture_fullstack() {
4040
memset(&f, 0, sizeof(f));
4141
f.fixture_data = ffd;
4242
f.cq = grpc_completion_queue_create_for_next(nullptr);
43-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
4443
return f;
4544
}
4645

‎test/core/end2end/h2_ssl_session_reuse_test.cc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -267,15 +267,13 @@ TEST(H2SessionReuseTest, SingleReuse) {
267267
cq, grpc_timeout_milliseconds_to_deadline(100), nullptr)
268268
.type == GRPC_QUEUE_TIMEOUT);
269269

270-
grpc_completion_queue* shutdown_cq =
271-
grpc_completion_queue_create_for_pluck(nullptr);
272-
grpc_server_shutdown_and_notify(server, shutdown_cq, tag(1000));
273-
GPR_ASSERT(grpc_completion_queue_pluck(shutdown_cq, tag(1000),
274-
grpc_timeout_seconds_to_deadline(5),
275-
nullptr)
276-
.type == GRPC_OP_COMPLETE);
270+
grpc_server_shutdown_and_notify(server, cq, tag(1000));
271+
grpc_event ev;
272+
do {
273+
ev = grpc_completion_queue_next(cq, grpc_timeout_seconds_to_deadline(5),
274+
nullptr);
275+
} while (ev.type != GRPC_OP_COMPLETE || ev.tag != tag(1000));
277276
grpc_server_destroy(server);
278-
grpc_completion_queue_destroy(shutdown_cq);
279277

280278
grpc_completion_queue_shutdown(cq);
281279
drain_cq(cq);

‎test/core/end2end/inproc_callback_test.cc

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ static grpc_end2end_test_fixture inproc_create_fixture(
216216
g_shutdown_callback = new ShutdownCallback();
217217
f.cq =
218218
grpc_completion_queue_create_for_callback(g_shutdown_callback, nullptr);
219-
f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
220219

221220
return f;
222221
}
@@ -269,13 +268,9 @@ static void drain_cq(grpc_completion_queue* /*cq*/) {
269268

270269
static void shutdown_server(grpc_end2end_test_fixture* f) {
271270
if (!f->server) return;
272-
grpc_server_shutdown_and_notify(
273-
f->server, f->shutdown_cq,
274-
reinterpret_cast<void*>(static_cast<intptr_t>(1000)));
275-
GPR_ASSERT(
276-
grpc_completion_queue_pluck(f->shutdown_cq, (void*)((intptr_t)1000),
277-
grpc_timeout_seconds_to_deadline(5), nullptr)
278-
.type == GRPC_OP_COMPLETE);
271+
grpc_server_shutdown_and_notify(f->server, f->cq, tag(1));
272+
expect_tag(1, true);
273+
verify_tags(five_seconds_from_now());
279274
grpc_server_destroy(f->server);
280275
f->server = nullptr;
281276
}
@@ -293,7 +288,6 @@ static void end_test(grpc_end2end_test_fixture* f) {
293288
grpc_completion_queue_shutdown(f->cq);
294289
drain_cq(f->cq);
295290
grpc_completion_queue_destroy(f->cq);
296-
grpc_completion_queue_destroy(f->shutdown_cq);
297291
}
298292

299293
static void simple_request_body(grpc_end2end_test_config /* config */,

‎test/core/end2end/invalid_call_argument_test.cc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ static void prepare_test(int is_client) {
118118
}
119119

120120
static void cleanup_test() {
121-
grpc_completion_queue* shutdown_cq;
122121
grpc_call_unref(g_state.call);
123122
cq_verifier_destroy(g_state.cqv);
124123
grpc_channel_destroy(g_state.chan);
@@ -127,14 +126,13 @@ static void cleanup_test() {
127126
grpc_metadata_array_destroy(&g_state.trailing_metadata_recv);
128127

129128
if (!g_state.is_client) {
130-
shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
131129
grpc_call_unref(g_state.server_call);
132-
grpc_server_shutdown_and_notify(g_state.server, shutdown_cq, tag(1000));
133-
GPR_ASSERT(grpc_completion_queue_pluck(shutdown_cq, tag(1000),
134-
grpc_timeout_seconds_to_deadline(5),
135-
nullptr)
136-
.type == GRPC_OP_COMPLETE);
137-
grpc_completion_queue_destroy(shutdown_cq);
130+
grpc_server_shutdown_and_notify(g_state.server, g_state.cq, tag(1000));
131+
grpc_event ev;
132+
do {
133+
ev = grpc_completion_queue_next(
134+
g_state.cq, grpc_timeout_seconds_to_deadline(5), nullptr);
135+
} while (ev.type != GRPC_OP_COMPLETE || ev.tag != tag(1000));
138136
grpc_server_destroy(g_state.server);
139137
grpc_call_details_destroy(&g_state.call_details);
140138
grpc_metadata_array_destroy(&g_state.server_initial_metadata_recv);

‎test/core/end2end/tests/authority_not_supported.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,12 @@ static void drain_cq(grpc_completion_queue* cq) {
5858

5959
static void shutdown_server(grpc_end2end_test_fixture* f) {
6060
if (!f->server) return;
61-
grpc_server_shutdown_and_notify(f->server, f->shutdown_cq, tag(1000));
62-
GPR_ASSERT(grpc_completion_queue_pluck(f->shutdown_cq, tag(1000),
63-
grpc_timeout_seconds_to_deadline(5),
64-
nullptr)
65-
.type == GRPC_OP_COMPLETE);
61+
grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000));
62+
grpc_event ev;
63+
do {
64+
ev = grpc_completion_queue_next(f->cq, grpc_timeout_seconds_to_deadline(5),
65+
nullptr);
66+
} while (ev.type != GRPC_OP_COMPLETE || ev.tag != tag(1000));
6667
grpc_server_destroy(f->server);
6768
f->server = nullptr;
6869
}
@@ -80,7 +81,6 @@ static void end_test(grpc_end2end_test_fixture* f) {
8081
grpc_completion_queue_shutdown(f->cq);
8182
drain_cq(f->cq);
8283
grpc_completion_queue_destroy(f->cq);
83-
grpc_completion_queue_destroy(f->shutdown_cq);
8484
}
8585

8686
/* Request/response with metadata and payload.*/

‎test/core/end2end/tests/bad_hostname.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,12 @@ static void drain_cq(grpc_completion_queue* cq) {
6060

6161
static void shutdown_server(grpc_end2end_test_fixture* f) {
6262
if (!f->server) return;
63-
grpc_server_shutdown_and_notify(f->server, f->shutdown_cq, tag(1000));
64-
GPR_ASSERT(grpc_completion_queue_pluck(f->shutdown_cq, tag(1000),
65-
grpc_timeout_seconds_to_deadline(5),
66-
nullptr)
67-
.type == GRPC_OP_COMPLETE);
63+
grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000));
64+
grpc_event ev;
65+
do {
66+
ev = grpc_completion_queue_next(f->cq, grpc_timeout_seconds_to_deadline(5),
67+
nullptr);
68+
} while (ev.type != GRPC_OP_COMPLETE || ev.tag != tag(1000));
6869
grpc_server_destroy(f->server);
6970
f->server = nullptr;
7071
}
@@ -82,7 +83,6 @@ static void end_test(grpc_end2end_test_fixture* f) {
8283
grpc_completion_queue_shutdown(f->cq);
8384
drain_cq(f->cq);
8485
grpc_completion_queue_destroy(f->cq);
85-
grpc_completion_queue_destroy(f->shutdown_cq);
8686
}
8787

8888
static void simple_request_body(grpc_end2end_test_fixture f) {

‎test/core/end2end/tests/bad_ping.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ static void end_test(grpc_end2end_test_fixture* f) {
6060
grpc_completion_queue_shutdown(f->cq);
6161
drain_cq(f->cq);
6262
grpc_completion_queue_destroy(f->cq);
63-
grpc_completion_queue_destroy(f->shutdown_cq);
6463
}
6564

6665
// Send more pings than server allows to trigger server's GOAWAY.

‎test/core/end2end/tests/binary_metadata.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,12 @@ static void drain_cq(grpc_completion_queue* cq) {
6969

7070
static void shutdown_server(grpc_end2end_test_fixture* f) {
7171
if (!f->server) return;
72-
grpc_server_shutdown_and_notify(f->server, f->shutdown_cq, tag(1000));
73-
GPR_ASSERT(grpc_completion_queue_pluck(f->shutdown_cq, tag(1000),
74-
grpc_timeout_seconds_to_deadline(5),
75-
nullptr)
76-
.type == GRPC_OP_COMPLETE);
72+
grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000));
73+
grpc_event ev;
74+
do {
75+
ev = grpc_completion_queue_next(f->cq, grpc_timeout_seconds_to_deadline(5),
76+
nullptr);
77+
} while (ev.type != GRPC_OP_COMPLETE || ev.tag != tag(1000));
7778
grpc_server_destroy(f->server);
7879
f->server = nullptr;
7980
}
@@ -91,7 +92,6 @@ static void end_test(grpc_end2end_test_fixture* f) {
9192
grpc_completion_queue_shutdown(f->cq);
9293
drain_cq(f->cq);
9394
grpc_completion_queue_destroy(f->cq);
94-
grpc_completion_queue_destroy(f->shutdown_cq);
9595
}
9696

9797
/* Request/response with metadata and payload.*/

0 commit comments

Comments
 (0)