Move TestRetrierCtx to retrier_test.go

retrier/retrier_go17_test.go

@@ -1,48 +0,0 @@
-// +build go1.7
-
-package retrier
-
-import (
-	"context"
-	"log"
-	"testing"
-	"time"
-)
-
-func genWorkWithCtx() func(ctx context.Context) error {
-	i = 0
-	return func(ctx context.Context) error {
-		select {
-		case <-ctx.Done():
-			return errFoo
-		default:
-			i++
-		}
-		return nil
-	}
-}
-
-func TestRetrierCtx(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-
-	r := New([]time.Duration{0, 10 * time.Millisecond}, WhitelistClassifier{})
-
-	err := r.RunCtx(ctx, genWorkWithCtx())
-	if err != nil {
-		t.Error(err)
-	}
-	if i != 1 {
-		t.Error("run wrong number of times")
-	}
-
-	cancel()
-
-	err = r.RunCtx(ctx, genWorkWithCtx())
-	if err != errFoo {
-		t.Error("context must be cancelled")
-	}
-	if i != 0 {
-		log.Println(i)
-		t.Error("run wrong number of times")
-	}
-}

retrier/retrier_test.go

@@ -1,6 +1,7 @@
 package retrier
 
 import (
+	"context"
 	"errors"
 	"testing"
 	"time"
@@ -19,6 +20,19 @@ func genWork(returns []error) func() error {
 	}
 }
 
+func genWorkWithCtx() func(ctx context.Context) error {
+	i = 0
+	return func(ctx context.Context) error {
+		select {
+		case <-ctx.Done():
+			return errFoo
+		default:
+			i++
+		}
+		return nil
+	}
+}
+
 func TestRetrier(t *testing.T) {
 	r := New([]time.Duration{0, 10 * time.Millisecond}, WhitelistClassifier{errFoo})
 
@@ -47,6 +61,30 @@ func TestRetrier(t *testing.T) {
 	}
 }
 
+func TestRetrierCtx(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+
+	r := New([]time.Duration{0, 10 * time.Millisecond}, WhitelistClassifier{})
+
+	err := r.RunCtx(ctx, genWorkWithCtx())
+	if err != nil {
+		t.Error(err)
+	}
+	if i != 1 {
+		t.Error("run wrong number of times")
+	}
+
+	cancel()
+
+	err = r.RunCtx(ctx, genWorkWithCtx())
+	if err != errFoo {
+		t.Error("context must be cancelled")
+	}
+	if i != 0 {
+		t.Error("run wrong number of times")
+	}
+}
+
 func TestRetrierNone(t *testing.T) {
 	r := New(nil, nil)