diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-04-24 10:34:06 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-04-24 10:34:06 +0200 |
commit | fb0120d4a9ee54121afd57a9e7c6dd12ebd4bc65 (patch) | |
tree | 1e0e7836eac0c65a28e7b9f3905632fb2595e4b2 /client | |
parent | 41b9ce837ad0e581754339d1e8c9205a36015077 (diff) |
Fix unstable test
Diffstat (limited to 'client')
-rw-r--r-- | client/go/internal/cli/cmd/feed.go | 1 | ||||
-rw-r--r-- | client/go/internal/cli/cmd/feed_test.go | 10 | ||||
-rw-r--r-- | client/go/internal/vespa/document/http.go | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/client/go/internal/cli/cmd/feed.go b/client/go/internal/cli/cmd/feed.go index 06568dd35c3..8635f4aa41b 100644 --- a/client/go/internal/cli/cmd/feed.go +++ b/client/go/internal/cli/cmd/feed.go @@ -139,6 +139,7 @@ func feed(r io.Reader, cli *CLI, options feedOptions) error { Route: options.route, TraceLevel: options.traceLevel, BaseURL: service.BaseURL, + NowFunc: cli.now, }, clients) throttler := document.NewThrottler(options.connections) // TODO(mpolden): Make doom duration configurable diff --git a/client/go/internal/cli/cmd/feed_test.go b/client/go/internal/cli/cmd/feed_test.go index 521d2b2abd0..eb641005ab7 100644 --- a/client/go/internal/cli/cmd/feed_test.go +++ b/client/go/internal/cli/cmd/feed_test.go @@ -44,9 +44,9 @@ func TestFeed(t *testing.T) { assert.Equal(t, "", stderr.String()) want := `{ - "feeder.seconds": 1.000, + "feeder.seconds": 3.000, "feeder.ok.count": 1, - "feeder.ok.rate": 1.000, + "feeder.ok.rate": 0.333, "feeder.error.count": 0, "feeder.inflight.count": 0, "http.request.count": 1, @@ -57,9 +57,9 @@ func TestFeed(t *testing.T) { "http.response.bytes": 16, "http.response.MBps": 0.000, "http.response.error.count": 0, - "http.response.latency.millis.min": 0, - "http.response.latency.millis.avg": 0, - "http.response.latency.millis.max": 0, + "http.response.latency.millis.min": 1000, + "http.response.latency.millis.avg": 1000, + "http.response.latency.millis.max": 1000, "http.response.code.counts": { "200": 1 } diff --git a/client/go/internal/vespa/document/http.go b/client/go/internal/vespa/document/http.go index 51b6fa4de39..0530144747a 100644 --- a/client/go/internal/vespa/document/http.go +++ b/client/go/internal/vespa/document/http.go @@ -40,6 +40,7 @@ type ClientOptions struct { Route string TraceLevel int Compression Compression + NowFunc func() time.Time } type countingHTTPClient struct { @@ -73,10 +74,14 @@ func NewClient(options ClientOptions, httpClients []util.HTTPClient) *Client { for _, client := range httpClients { countingClients = append(countingClients, countingHTTPClient{client: client}) } + nowFunc := options.NowFunc + if nowFunc == nil { + nowFunc = time.Now + } return &Client{ options: options, httpClients: countingClients, - now: time.Now, + now: nowFunc, } } |