From 7e481fe943b259edeacc7b8561abfff685d1c24b Mon Sep 17 00:00:00 2001 From: v2ray Date: Wed, 11 May 2016 23:27:54 -0700 Subject: [PATCH] rename retry_test package --- common/retry/retry.go | 4 ++-- common/retry/retry_test.go | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/retry/retry.go b/common/retry/retry.go index a9ba75d5..d647956b 100644 --- a/common/retry/retry.go +++ b/common/retry/retry.go @@ -6,7 +6,7 @@ import ( ) var ( - errorRetryFailed = errors.New("All retry attempts failed.") + ErrorRetryFailed = errors.New("All retry attempts failed.") ) // Strategy is a way to retry on a specific function. @@ -29,7 +29,7 @@ func (r *retryer) On(method func() error) error { } delay := r.NextDelay(attempt) if delay < 0 { - return errorRetryFailed + return ErrorRetryFailed } <-time.After(time.Duration(delay) * time.Millisecond) attempt++ diff --git a/common/retry/retry_test.go b/common/retry/retry_test.go index 33bb47b8..0b245cdf 100644 --- a/common/retry/retry_test.go +++ b/common/retry/retry_test.go @@ -1,10 +1,11 @@ -package retry +package retry_test import ( "errors" "testing" "time" + . "github.com/v2ray/v2ray-core/common/retry" v2testing "github.com/v2ray/v2ray-core/testing" "github.com/v2ray/v2ray-core/testing/assert" ) @@ -76,6 +77,6 @@ func TestRetryExhausted(t *testing.T) { }) duration := time.Since(startTime) - assert.Error(err).Equals(errorRetryFailed) + assert.Error(err).Equals(ErrorRetryFailed) assert.Int64(int64(duration / time.Millisecond)).AtLeast(1900) }