make util.Until return immediately if stop is written inside the loop

pkg/util/util_test.go

@@ -24,6 +24,7 @@ import (
 	"reflect"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/ghodss/yaml"
 )
@@ -48,6 +49,17 @@ func TestUntil(t *testing.T) {
 	<-called
 }
 
+func TestUntilReturnsImmediately(t *testing.T) {
+	now := time.Now()
+	ch := make(chan struct{})
+	Until(func() {
+		close(ch)
+	}, 30*time.Second, ch)
+	if now.Add(25 * time.Second).Before(time.Now()) {
+		t.Errorf("Until did not return immediately when the stop chan was closed inside the func")
+	}
+}
+
 func TestHandleCrash(t *testing.T) {
 	count := 0
 	expect := 10