DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3846 from tjamet/test-race-condition

Browse source 
Fix race condition in metric process collector test
This commit is contained in:
Kubernetes Prow Robot 2019-03-04 13:44:43 -08:00 committed by GitHub
commit c6f4ffd686
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/ingress/metric/collectors/process_test.go
View file

@ -55,11 +55,13 @@ func TestProcessCollector(t *testing.T) {
} else { } else {
t.Logf("Status: %v", status.ExitStatus()) t.Logf("Status: %v", status.ExitStatus())
} }
done <- struct{}{}
}() }()
cm, err := NewNGINXProcess("pod", "default", "nginx") cm, err := NewNGINXProcess("pod", "default", "nginx")
if err != nil { if err != nil {
t.Errorf("unexpected error creating nginx status collector: %v", err) t.Errorf("unexpected error creating nginx status collector: %v", err)
t.FailNow()
} }
go cm.Start() go cm.Start()
@ -68,6 +70,7 @@ func TestProcessCollector(t *testing.T) {
cm.Stop() cm.Stop()
cmd.Process.Kill() cmd.Process.Kill()
<-done
close(done) close(done)
}() }()