Skip to content

Commit

Permalink
fix: golangci lint return values not checked in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
phanama committed Aug 29, 2023
1 parent 7d4353b commit 9028a9f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
6 changes: 4 additions & 2 deletions util/cache/redis_hook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ func Test_ReconnectCallbackHookCalled(t *testing.T) {
faultyDNSRedisClient.AddHook(hook)

faultyDNSClient := NewRedisCache(faultyDNSRedisClient, 60*time.Second, RedisCompressionNone)
faultyDNSClient.Set(&Item{Key: "baz", Object: "foo"})
err = faultyDNSClient.Set(&Item{Key: "baz", Object: "foo"})
assert.Equal(t, called, true)
assert.Error(t, err)
}

func Test_ReconnectCallbackHookNotCalled(t *testing.T) {
Expand All @@ -46,6 +47,7 @@ func Test_ReconnectCallbackHookNotCalled(t *testing.T) {
redisClient.AddHook(hook)
client := NewRedisCache(redisClient, 60*time.Second, RedisCompressionNone)

client.Set(&Item{Key: "foo", Object: "bar"})
err = client.Set(&Item{Key: "foo", Object: "bar"})
assert.Equal(t, called, false)
assert.NoError(t, err)
}
18 changes: 12 additions & 6 deletions util/cache/redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,24 +135,30 @@ func TestRedisMetrics(t *testing.T) {
var res string

//client successful request
client.Set(&Item{Key: "foo", Object: "bar"})
client.Get("foo", &res)
err = client.Set(&Item{Key: "foo", Object: "bar"})
assert.NoError(t, err)
err = client.Get("foo", &res)
assert.NoError(t, err)

c, err := ms.redisRequestCounter.GetMetricWithLabelValues("mock", "false")
c.Write(metric)
assert.NoError(t, err)
err = c.Write(metric)
assert.NoError(t, err)
assert.Equal(t, metric.Counter.GetValue(), float64(2))

//faulty client failed request
faultyClient.Get("foo", &res)
err = faultyClient.Get("foo", &res)
assert.Error(t, err)
c, err = ms.redisRequestCounter.GetMetricWithLabelValues("mock", "true")
c.Write(metric)
assert.NoError(t, err)
err = c.Write(metric)
assert.NoError(t, err)
assert.Equal(t, metric.Counter.GetValue(), float64(1))

//both clients histogram count
o, err := ms.redisRequestHistogram.GetMetricWithLabelValues("mock")
o.(prometheus.Metric).Write(metric)
assert.NoError(t, err)
err = o.(prometheus.Metric).Write(metric)
assert.NoError(t, err)
assert.Equal(t, int(metric.Histogram.GetSampleCount()), 3)
}

0 comments on commit 9028a9f

Please sign in to comment.