Cleanup BackOff logic

Author: davidcollom

pkg/client/util/http_backoff.go

@@ -8,12 +8,12 @@ import (
 )
 
 // This is a custom Backoff that enforces the Max wait duration.
-// If the sleep is greater we refuse to sleep at all
+// If the sleep is greater we only sleep for the max duration.
 func HTTPBackOff(min, max time.Duration, attemptNum int, resp *http.Response) time.Duration {
 	sleep := retryablehttp.DefaultBackoff(min, max, attemptNum, resp)
-	if sleep.Abs() <= max {
-		return sleep.Abs()
+	if sleep.Abs() >= max {
+		return max.Abs()
 	}
 
-	return max.Abs()
+	return sleep.Abs()
 }

pkg/client/util/http_backoff_test.go

@@ -33,7 +33,7 @@ func TestHTTPBackOff(t *testing.T) {
 			attemptNum: 10,
 			resp: &http.Response{
 				StatusCode: http.StatusTooManyRequests,
-				Header:     http.Header{"Retry-After": []string{"3600"}}},
+				Header:     http.Header{"Retry-After": []string{"484289h20m8s"}}},
 			expSleep: 500 * time.Millisecond,
 		},
 		{

pkg/controller/options/options_test.go

@@ -5,6 +5,9 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/jetstack/version-checker/pkg/api"
 )
 
@@ -135,20 +138,16 @@ func TestBuild(t *testing.T) {
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			options, err := New(test.annotations).Options(test.containerName)
+
 			if len(test.expErr) > 0 {
-				if err == nil || err.Error() != test.expErr {
-					t.Errorf("unexpected error, exp=%s got=%v",
-						test.expErr, err)
-				}
-			} else if err != nil {
-				t.Errorf("unexpected error, exp=%s got=%v",
-					test.expErr, err)
-			}
+				assert.Error(t, err)
+				assert.Equal(t, test.expErr, err.Error())
 
-			if !reflect.DeepEqual(test.expOptions, options) {
-				t.Errorf("unexpected options for %s=%v exp=%#+v got=%#+v",
-					test.containerName, test.annotations, test.expOptions, options)
+			} else {
+				require.NoError(t, err)
 			}
+
+			assert.Exactly(t, test.expOptions, options)
 		})
 	}
 }