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

Fix data race updating ingress status (#1872)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-01-02 17:43:25 -03:00 • committed by GitHub
parent da829748ec
commit a09527cf6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/ingress/status/status_test.go
View file

@ -273,9 +273,8 @@ func TestStatusActions(t *testing.T) {
fk := fkSync.(statusSync)
ns := make(chan struct{})
// start it and wait for the election and syn actions
go fk.Run(ns)
go fk.Run()
// wait for the election
time.Sleep(100 * time.Millisecond)
// execute sync
@ -294,6 +293,8 @@ func TestStatusActions(t *testing.T) {
t.Fatalf("returned %v but expected %v", fooIngress1CurIPs, newIPs)
}
time.Sleep(1 * time.Second)
// execute shutdown
fk.Shutdown()
// ingress should be empty
@ -314,9 +315,6 @@ func TestStatusActions(t *testing.T) {
if oic.Status.LoadBalancer.Ingress[0].IP != "0.0.0.0" && oic.Status.LoadBalancer.Ingress[0].Hostname != "foo.bar.com" {
t.Fatalf("invalid ingress status for rule with different class")
}
// end test
ns <- struct{}{}
}
func TestCallback(t *testing.T) {
@ -325,6 +323,7 @@ func TestCallback(t *testing.T) {
func TestKeyfunc(t *testing.T) {
fk := buildStatusSync()
i := "foo_base_pod"
r, err := fk.keyfunc(i)