From 51c7570ae19cb5aa6102c1d51201d950b0880fb6 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Tue, 7 Feb 2017 16:51:35 -0800 Subject: [PATCH] Fix incorrect error message in watch.Until --- staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go | 3 +++ staging/src/k8s.io/apimachinery/pkg/watch/until.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go b/staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go index 4704afd91bd..3c17d72b41a 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go @@ -129,6 +129,9 @@ func Jitter(duration time.Duration, maxFactor float64) time.Duration { // ErrWaitTimeout is returned when the condition exited without success. var ErrWaitTimeout = errors.New("timed out waiting for the condition") +// ErrChannelClosed is returned when the watch channel is closed. +var ErrChannelClosed = errors.New("watch channel closed") + // ConditionFunc returns true if the condition is satisfied, or an error // if the loop should be aborted. type ConditionFunc func() (done bool, err error) diff --git a/staging/src/k8s.io/apimachinery/pkg/watch/until.go b/staging/src/k8s.io/apimachinery/pkg/watch/until.go index 31ed280ddc9..5c340f07176 100644 --- a/staging/src/k8s.io/apimachinery/pkg/watch/until.go +++ b/staging/src/k8s.io/apimachinery/pkg/watch/until.go @@ -61,7 +61,7 @@ func Until(timeout time.Duration, watcher Interface, conditions ...ConditionFunc select { case event, ok := <-ch: if !ok { - return lastEvent, wait.ErrWaitTimeout + return lastEvent, wait.ErrChannelClosed } lastEvent = &event