github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4353 from gaurav1086/TestExchangeBasic_fix_deadlock

Browse Source 
[events] Fix deadlock in TestExchangeBasic
This commit is contained in:
Akihiro Suda 2020-07-06 18:03:07 +09:00 committed by GitHub
commit 422c401a48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
events/exchange/exchange_test.go
View File

@ -52,11 +52,8 @@ func TestExchangeBasic(t *testing.T) {
eventq2, errq2 := exchange.Subscribe(ctx2) eventq2, errq2 := exchange.Subscribe(ctx2)
t.Log("publish") t.Log("publish")
var wg sync.WaitGroup
wg.Add(1)
errChan := make(chan error) errChan := make(chan error)
go func() { go func() {
defer wg.Done()
defer close(errChan) defer close(errChan)
for _, event := range testevents { for _, event := range testevents {
if err := exchange.Publish(ctx, "/test", event); err != nil { if err := exchange.Publish(ctx, "/test", event); err != nil {
@ -69,7 +66,6 @@ func TestExchangeBasic(t *testing.T) {
}() }()
t.Log("waiting") t.Log("waiting")
wg.Wait()
if err := <-errChan; err != nil { if err := <-errChan; err != nil {
t.Fatal(err) t.Fatal(err)
} }