status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix panicky xDS test flakes (#16305) 

* Add defensive guard to make some tests less flaky and panic less

* Do the actual fix
This commit is contained in:
Andrew Stucki 2023-02-17 14:07:49 -05:00 committed by GitHub
parent e4a992c581
commit ee99d5c3a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/xds/testing.go
View File

@ -85,6 +85,8 @@ type TestEnvoy struct {
EnvoyVersion string EnvoyVersion string
deltaStream *TestADSDeltaStream // Incremental v3 deltaStream *TestADSDeltaStream // Incremental v3
closed bool
} }
// NewTestEnvoy creates a TestEnvoy instance. // NewTestEnvoy creates a TestEnvoy instance.
@ -225,9 +227,9 @@ func (e *TestEnvoy) Close() error {
defer e.mu.Unlock() defer e.mu.Unlock()
// unblock the recv chans to simulate recv errors when client disconnects // unblock the recv chans to simulate recv errors when client disconnects
if e.deltaStream != nil && e.deltaStream.recvCh != nil { if !e.closed && e.deltaStream.recvCh != nil {
close(e.deltaStream.recvCh) close(e.deltaStream.recvCh)
e.deltaStream = nil e.closed = true
} }
if e.cancel != nil { if e.cancel != nil {
e.cancel() e.cancel()