From 6b62e2d1cc5294b07b1d21fcd0c73f143302cb4f Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Thu, 14 Nov 2019 17:06:15 -0800 Subject: [PATCH] Post-review change; ensure handshake queue has been initialized in alts_tsi_handshaker_test --- src/core/tsi/alts/handshaker/alts_handshaker_client.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index f87a01944e0..775ccb73ba9 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -829,6 +829,12 @@ void alts_handshaker_client_ref_for_testing(alts_handshaker_client* c) { void alts_handshaker_client_on_status_received_for_testing( alts_handshaker_client* c, grpc_status_code status, grpc_error* error) { + // We first make sure that the handshake queue has been initialized + // here because there are tests that use this API that mock out + // other parts of the alts_handshaker_client in such a way that the + // code path that would normally ensure that the handshake queue + // has been initialized isn't taken. + gpr_once_init(&g_queued_handshakes_init, DoHandshakeQueuesInit); alts_grpc_handshaker_client* client = reinterpret_cast(c); client->handshake_status_code = status;