From 6441b4b2c7ed2abef3b7f896020e84f90f573456 Mon Sep 17 00:00:00 2001 From: "R.B. Boyer" <4903+rboyer@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:57:43 -0500 Subject: [PATCH] xds: fix flaky protocol tests (#10410) --- agent/xds/delta_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/agent/xds/delta_test.go b/agent/xds/delta_test.go index 288ea1a47c..028fca043e 100644 --- a/agent/xds/delta_test.go +++ b/agent/xds/delta_test.go @@ -191,6 +191,9 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) { snap = newTestSnapshot(t, snap, "") mgr.DeliverConfig(t, sid, snap) + // We never send an EDS reply about this change. + assertDeltaChanBlocked(t, envoy.deltaStream.sendCh) + // and fix the subscription envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{ ResourceNamesSubscribe: []string{ @@ -249,6 +252,9 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) { // Trigger only an EDS update (flipping BACK to 2 endpoints in the LBassignment) snap = newTestSnapshot(t, snap, "") mgr.DeliverConfig(t, sid, snap) + + // We never send any replies about this change because we died. + assertDeltaChanBlocked(t, envoy.deltaStream.sendCh) }) envoy.Close()