Merge pull request avast#81 from JamieEdge/fix-80

fix: reslice error log to remove nil values

Author: JaSei

retry.go

@@ -157,7 +157,7 @@ func Do(retryableFunc RetryableFunc, opts ...Option) error {
 				}
 				n++
 				errorLog[n] = config.context.Err()
-				return errorLog
+				return errorLog[:lenWithoutNil(errorLog)]
 			}
 
 		} else {
@@ -175,7 +175,7 @@ func Do(retryableFunc RetryableFunc, opts ...Option) error {
 	if config.lastErrorOnly {
 		return errorLog[lastErrIndex]
 	}
-	return errorLog
+	return errorLog[:lenWithoutNil(errorLog)]
 }
 
 func newDefaultRetryConfig() *Config {

retry_test.go

@@ -31,6 +31,7 @@ func TestDoAllFailed(t *testing.T) {
 #8: test
 #9: test
 #10: test`
+	assert.Len(t, err, 10)
 	assert.Equal(t, expectedErrorFormat, err.Error(), "retry error format")
 	assert.Equal(t, uint(45), retrySum, "right count of retry")
 }
@@ -68,6 +69,7 @@ func TestRetryIf(t *testing.T) {
 #1: test
 #2: test
 #3: special`
+	assert.Len(t, err, 3)
 	assert.Equal(t, expectedErrorFormat, err.Error(), "retry error format")
 	assert.Equal(t, uint(2), retryCount, "right count of retry")
 
@@ -164,7 +166,7 @@ func TestLastErrorOnly(t *testing.T) {
 func TestUnrecoverableError(t *testing.T) {
 	attempts := 0
 	testErr := errors.New("error")
-	expectedErr := Error{testErr, nil}
+	expectedErr := Error{testErr}
 	err := Do(
 		func() error {
 			attempts++
@@ -367,6 +369,7 @@ func TestContext(t *testing.T) {
 #1: test
 #2: test
 #3: context canceled`
+		assert.Len(t, err, 3)
 		assert.Equal(t, expectedErrorFormat, err.Error(), "retry error format")
 		assert.Equal(t, 2, retrySum, "called at most once")
 	})