From 3d08c73767a1f49f034ebb35cd6e91bb0dd4ed45 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Mon, 9 May 2016 15:57:08 -0700 Subject: [PATCH] Address PR Comments 1 --- pkg/kubectl/resource/visitor.go | 4 ++-- pkg/kubectl/resource/visitor_test.go | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/kubectl/resource/visitor.go b/pkg/kubectl/resource/visitor.go index 4654d80cda6..e29513dbd0d 100644 --- a/pkg/kubectl/resource/visitor.go +++ b/pkg/kubectl/resource/visitor.go @@ -225,7 +225,7 @@ type URLVisitor struct { } func (v *URLVisitor) Visit(fn VisitorFunc) error { - body, err := v.readHttpWithRetries(httpgetImpl, time.Second, v.URL.String()) + body, err := readHttpWithRetries(httpgetImpl, time.Second, v.URL.String()) if err != nil { return err } @@ -235,7 +235,7 @@ func (v *URLVisitor) Visit(fn VisitorFunc) error { } // readHttpWithRetries tries to http.Get the v.URL 3 times before giving up. -func (v *URLVisitor) readHttpWithRetries(get httpget, duration time.Duration, u string) (io.ReadCloser, error) { +func readHttpWithRetries(get httpget, duration time.Duration, u string) (io.ReadCloser, error) { var err error var body io.ReadCloser for i := 0; i < 3; i++ { diff --git a/pkg/kubectl/resource/visitor_test.go b/pkg/kubectl/resource/visitor_test.go index b025b775b08..c69231e9ff3 100644 --- a/pkg/kubectl/resource/visitor_test.go +++ b/pkg/kubectl/resource/visitor_test.go @@ -27,12 +27,10 @@ import ( ) func TestVisitorHttpGet(t *testing.T) { - instance := &URLVisitor{} - // Test retries on errors i := 0 expectedErr := fmt.Errorf("Failed to get http") - actualBytes, actualErr := instance.readHttpWithRetries(func(url string) (int, string, io.ReadCloser, error) { + actualBytes, actualErr := readHttpWithRetries(func(url string) (int, string, io.ReadCloser, error) { assert.Equal(t, "hello", url) i++ if i > 2 { @@ -46,7 +44,7 @@ func TestVisitorHttpGet(t *testing.T) { // Test that 500s are retried. i = 0 - actualBytes, actualErr = instance.readHttpWithRetries(func(url string) (int, string, io.ReadCloser, error) { + actualBytes, actualErr = readHttpWithRetries(func(url string) (int, string, io.ReadCloser, error) { assert.Equal(t, "hello", url) i++ return 501, "Status", nil, nil @@ -57,7 +55,7 @@ func TestVisitorHttpGet(t *testing.T) { // Test that 300s are not retried i = 0 - actualBytes, actualErr = instance.readHttpWithRetries(func(url string) (int, string, io.ReadCloser, error) { + actualBytes, actualErr = readHttpWithRetries(func(url string) (int, string, io.ReadCloser, error) { assert.Equal(t, "hello", url) i++ return 300, "Status", nil, nil @@ -69,7 +67,7 @@ func TestVisitorHttpGet(t *testing.T) { // Test Success i = 0 b := bytes.Buffer{} - actualBytes, actualErr = instance.readHttpWithRetries(func(url string) (int, string, io.ReadCloser, error) { + actualBytes, actualErr = readHttpWithRetries(func(url string) (int, string, io.ReadCloser, error) { assert.Equal(t, "hello", url) i++ if i > 1 {