From af87dc7234cce08db1dde15b7021b58d7d948488 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Tue, 23 Jul 2024 21:27:58 +0200 Subject: [PATCH] fix test --- cmd/heartbeat/heartbeat.go | 2 +- cmd/heartbeat/heartbeat_test.go | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/heartbeat/heartbeat.go b/cmd/heartbeat/heartbeat.go index 4b5192af..70b9efbe 100644 --- a/cmd/heartbeat/heartbeat.go +++ b/cmd/heartbeat/heartbeat.go @@ -197,7 +197,7 @@ func RateLimited(offline paramscmd.Offline) bool { return false } - return time.Since(offline.LastSentAt) > offline.RateLimit + return time.Since(offline.LastSentAt) < offline.RateLimit } // ResetRateLimit updates the internal.heartbeats_last_sent_at timestamp diff --git a/cmd/heartbeat/heartbeat_test.go b/cmd/heartbeat/heartbeat_test.go index 85998fd9..155fc341 100644 --- a/cmd/heartbeat/heartbeat_test.go +++ b/cmd/heartbeat/heartbeat_test.go @@ -1056,8 +1056,14 @@ func TestSendHeartbeats_ObfuscateProjectNotBranch(t *testing.T) { func TestRateLimited(t *testing.T) { assert.False(t, cmdheartbeat.RateLimited(params.Offline{Disabled: true, RateLimit: 1, LastSentAt: time.Now()})) assert.False(t, cmdheartbeat.RateLimited(params.Offline{RateLimit: 0, LastSentAt: time.Now()})) - assert.False(t, cmdheartbeat.RateLimited(params.Offline{RateLimit: offline.RateLimitDefaultSeconds, LastSentAt: time.Now().Add(time.Duration(-offline.RateLimitDefaultSeconds) * time.Second)})) - assert.True(t, cmdheartbeat.RateLimited(params.Offline{RateLimit: offline.RateLimitDefaultSeconds, LastSentAt: time.Now()})) + + limit := time.Duration(offline.RateLimitDefaultSeconds) * time.Second + + assert.False(t, cmdheartbeat.RateLimited(params.Offline{ + RateLimit: limit, + LastSentAt: time.Now().Add(time.Duration(-offline.RateLimitDefaultSeconds*2) * time.Second), + })) + assert.True(t, cmdheartbeat.RateLimited(params.Offline{RateLimit: limit, LastSentAt: time.Now()})) } func setupTestServer() (string, *http.ServeMux, func()) {