Merge pull request #21 from elisasre/fixtests

Exit if context is closed

request.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -47,7 +48,13 @@ type Backoff struct {
 }
 
 // MakeRequest ...
-func MakeRequest(ctx context.Context, request HTTPRequest, output interface{}, client *http.Client, backoff Backoff) (*HTTPResponse, error) {
+func MakeRequest(
+	ctx context.Context,
+	request HTTPRequest,
+	output interface{},
+	client *http.Client,
+	backoff Backoff,
+) (*HTTPResponse, error) {
 	httpresp := &HTTPResponse{}
 	err := SleepUntil(backoff, func() (bool, error) {
 		httpreq, err := http.NewRequest(request.Method, request.URL, nil)
@@ -79,6 +86,9 @@ func MakeRequest(ctx context.Context, request HTTPRequest, output interface{}, c
 				Str("url", request.URL).
 				Str("error", err.Error()).
 				Msg("do request error")
+			if errors.Is(err, context.DeadlineExceeded) {
+				return true, err
+			}
 			return false, err
 		}
 		defer resp.Body.Close()

request_test.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"time"
@@ -18,7 +19,9 @@ func ExampleMakeRequest() {
 	}
 	out := Out{}
 	client := &http.Client{}
+	ctx := context.Background()
 	body, err := MakeRequest(
+		ctx,
 		HTTPRequest{
 			URL:    "https://ingress-api.csf.elisa.fi/healthz",
 			Method: "GET",
@@ -29,10 +32,26 @@ func ExampleMakeRequest() {
 		backoff,
 	)
 
-	fmt.Printf("%s\n%s\n%d\n%v", out.Message, body.Body, body.StatusCode, err)
+	fmt.Printf("%s\n%s\n%d\n%v\n", out.Message, body.Body, body.StatusCode, err)
 
+	ctx, cancel := context.WithTimeout(ctx, 1*time.Millisecond)
+	defer cancel()
+	_, err = MakeRequest(
+		ctx,
+		HTTPRequest{
+			URL:    "https://ingress-api.csf.elisa.fi/healthz",
+			Method: "GET",
+			OKCode: []int{200},
+		},
+		&out,
+		client,
+		backoff,
+	)
+
+	fmt.Printf("%v", err)
 	// Output: pong
 	// {"message":"pong","error":""}
 	// 200
 	// <nil>
+	// Get "https://ingress-api.csf.elisa.fi/healthz": context deadline exceeded
 }

time.go

@@ -26,7 +26,7 @@ func SleepUntil(backoff Backoff, condition ConditionFunc) error {
 
 	}
 	if err != nil {
-		return errors.Wrap(err, "retrying timed out")
+		return err
 	}
 	return errors.New("Timed out waiting for the condition")
 }