Merge pull request #167 from fastly/dgryski/httpcache-test-improvements

httpcache test improvements

Author: dgryski

integration_tests/httpcache/main.go

@@ -12,6 +12,7 @@ import (
 	"math/rand"
 	"runtime"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -83,23 +84,27 @@ func main() {
 
 type query struct {
 	status *int
+	wait   time.Duration
 }
 
 func (q *query) String() string {
 	if q == nil {
 		return ""
 	}
 
-	var s string
+	var args []string
 
 	if q.status != nil {
-		if s != "" {
-			s += "&"
-		}
-		s += fmt.Sprintf("status=%v", *q.status)
+		s := fmt.Sprintf("status=%v", *q.status)
+		args = append(args, s)
+	}
+
+	if q.wait != 0 {
+		s := fmt.Sprintf("wait=%v", q.wait.Milliseconds())
+		args = append(args, s)
 	}
 
-	return "?" + s
+	return "?" + strings.Join(args, "&")
 }
 
 func getTestReq(method string, q *query, body io.Reader) *fsthttp.Request {
@@ -240,7 +245,7 @@ func testBeforeSendAddHeader(ctx context.Context) error {
 }
 
 func testRequestCollapse(ctx context.Context) error {
-	r := getTestReq("", nil, nil)
+	r := getTestReq("", &query{wait: 1 * time.Second}, nil)
 
 	var beforeSendCount int
 	var mu sync.Mutex
@@ -265,13 +270,15 @@ func testRequestCollapse(ctx context.Context) error {
 		<-ch
 		var err error
 		resp, err = r.Send(ctx, backend)
+		time.Sleep(10 * time.Millisecond)
 		errch <- err
 	}()
 
 	go func() {
 		<-ch
 		var err error
 		resp2, err = r2.Send(ctx, backend)
+		time.Sleep(20 * time.Millisecond)
 		errch <- err
 	}()