github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-30 00:41:53 +00:00
Code Issues Projects Releases Wiki Activity

Call cancel functions to avoid context leaks

Browse Source 
Kubernetes-commit: 8dc9619d44ce2074696a4036b2acdc21f3cd0662
This commit is contained in:
Yang Li 2018-11-18 17:40:35 +08:00 committed by Kubernetes Publisher
parent 6924ba6dfc
commit f3619f04f1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/watch/until_test.go
View File

@ -53,7 +53,9 @@ func TestUntil(t *testing.T) {
func(event watch.Event) (bool, error) { return event.Type == watch.Modified, nil }, func(event watch.Event) (bool, error) { return event.Type == watch.Modified, nil },
} }
ctx, _ := context.WithTimeout(context.Background(), time.Minute) ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
defer cancel()
lastEvent, err := UntilWithoutRetry(ctx, fw, conditions...) lastEvent, err := UntilWithoutRetry(ctx, fw, conditions...)
if err != nil { if err != nil {
t.Fatalf("expected nil error, got %#v", err) t.Fatalf("expected nil error, got %#v", err)
@ -80,7 +82,9 @@ func TestUntilMultipleConditions(t *testing.T) {
func(event watch.Event) (bool, error) { return event.Type == watch.Added, nil }, func(event watch.Event) (bool, error) { return event.Type == watch.Added, nil },
} }
ctx, _ := context.WithTimeout(context.Background(), time.Minute) ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
defer cancel()
lastEvent, err := UntilWithoutRetry(ctx, fw, conditions...) lastEvent, err := UntilWithoutRetry(ctx, fw, conditions...)
if err != nil { if err != nil {
t.Fatalf("expected nil error, got %#v", err) t.Fatalf("expected nil error, got %#v", err)
@ -108,7 +112,9 @@ func TestUntilMultipleConditionsFail(t *testing.T) {
func(event watch.Event) (bool, error) { return event.Type == watch.Deleted, nil }, func(event watch.Event) (bool, error) { return event.Type == watch.Deleted, nil },
} }
ctx, _ := context.WithTimeout(context.Background(), 10*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
lastEvent, err := UntilWithoutRetry(ctx, fw, conditions...) lastEvent, err := UntilWithoutRetry(ctx, fw, conditions...)
if err != wait.ErrWaitTimeout { if err != wait.ErrWaitTimeout {
t.Fatalf("expected ErrWaitTimeout error, got %#v", err) t.Fatalf("expected ErrWaitTimeout error, got %#v", err)
@ -169,6 +175,7 @@ func TestUntilErrorCondition(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), time.Minute) ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
defer cancel() defer cancel()
_, err := UntilWithoutRetry(ctx, fw, conditions...) _, err := UntilWithoutRetry(ctx, fw, conditions...)
if err == nil { if err == nil {
t.Fatal("expected an error") t.Fatal("expected an error")