Merge pull request imroc#210 from jfilipczyk/bugfix/do-not-retry-when…

…-count-zero

fix: do not retry when RetryCount eq 0

request.go

@@ -5,10 +5,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/hashicorp/go-multierror"
-	"github.com/imroc/req/v3/internal/dump"
-	"github.com/imroc/req/v3/internal/header"
-	"github.com/imroc/req/v3/internal/util"
 	"io"
 	"net/http"
 	urlpkg "net/url"
@@ -17,6 +13,11 @@ import (
 	"reflect"
 	"strings"
 	"time"
+
+	"github.com/hashicorp/go-multierror"
+	"github.com/imroc/req/v3/internal/dump"
+	"github.com/imroc/req/v3/internal/header"
+	"github.com/imroc/req/v3/internal/util"
 )
 
 // Request struct is used to compose and fire individual request from
@@ -577,7 +578,7 @@ func (r *Request) do() (resp *Response, err error) {
 			resp, err = r.client.roundTrip(r)
 		}
 
-		if r.retryOption == nil || (r.RetryAttempt >= r.retryOption.MaxRetries && r.retryOption.MaxRetries > 0) { // absolutely cannot retry.
+		if r.retryOption == nil || (r.RetryAttempt >= r.retryOption.MaxRetries && r.retryOption.MaxRetries >= 0) { // absolutely cannot retry.
 			return
 		}
 

retry_test.go

@@ -2,12 +2,13 @@ package req
 
 import (
 	"bytes"
-	"github.com/imroc/req/v3/internal/tests"
 	"io"
 	"math"
 	"net/http"
 	"testing"
 	"time"
+
+	"github.com/imroc/req/v3/internal/tests"
 )
 
 func TestRetryBackOff(t *testing.T) {
@@ -170,3 +171,28 @@ func TestRetryFalse(t *testing.T) {
 	tests.AssertIsNil(t, resp.Response)
 	tests.AssertEqual(t, 0, resp.Request.RetryAttempt)
 }
+
+func TestRetryTurnedOffWhenRetryCountEqZero(t *testing.T) {
+	resp, err := tc().R().
+		SetRetryCount(0).
+		SetRetryCondition(func(resp *Response, err error) bool {
+			t.Fatal("retry condition should not be executed")
+			return true
+		}).
+		Get("https://non-exists-host.com.cn")
+	tests.AssertNotNil(t, err)
+	tests.AssertIsNil(t, resp.Response)
+	tests.AssertEqual(t, 0, resp.Request.RetryAttempt)
+
+	resp, err = tc().
+		SetCommonRetryCount(0).
+		SetCommonRetryCondition(func(resp *Response, err error) bool {
+			t.Fatal("retry condition should not be executed")
+			return true
+		}).
+		R().
+		Get("https://non-exists-host.com.cn")
+	tests.AssertNotNil(t, err)
+	tests.AssertIsNil(t, resp.Response)
+	tests.AssertEqual(t, 0, resp.Request.RetryAttempt)
+}