1
0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-18 01:57:02 +00:00

storage: resolve linter errors (#432)

Signed-off-by: James Hillyerd <james@hillyerd.com>
This commit is contained in:
James Hillyerd
2023-11-13 11:22:49 -08:00
committed by GitHub
parent 1ce1674861
commit e22ed26633
2 changed files with 13 additions and 8 deletions

View File

@@ -9,6 +9,7 @@ import (
"github.com/inbucket/inbucket/v3/pkg/extension" "github.com/inbucket/inbucket/v3/pkg/extension"
"github.com/inbucket/inbucket/v3/pkg/storage" "github.com/inbucket/inbucket/v3/pkg/storage"
"github.com/inbucket/inbucket/v3/pkg/test" "github.com/inbucket/inbucket/v3/pkg/test"
"github.com/stretchr/testify/require"
) )
// TestSuite runs storage package test suite on file store. // TestSuite runs storage package test suite on file store.
@@ -52,12 +53,13 @@ func TestMaxSize(t *testing.T) {
// Calculate actual size. // Calculate actual size.
gotSize := int64(0) gotSize := int64(0)
s.VisitMailboxes(func(messages []storage.Message) bool { err := s.VisitMailboxes(func(messages []storage.Message) bool {
for _, m := range messages { for _, m := range messages {
gotSize += m.Size() gotSize += m.Size()
} }
return true return true
}) })
require.NoError(t, err, "VisitMailboxes() must succeed")
// Verify state. Messages are ~75 bytes each. // Verify state. Messages are ~75 bytes each.
if gotSize < 2048-75 { if gotSize < 2048-75 {
@@ -80,11 +82,14 @@ func TestMaxSize(t *testing.T) {
}(mailbox) }(mailbox)
} }
wg.Wait() wg.Wait()
// Verify zero stored messages.
count := 0 count := 0
s.VisitMailboxes(func(messages []storage.Message) bool { err = s.VisitMailboxes(func(messages []storage.Message) bool {
count += len(messages) count += len(messages)
return true return true
}) })
require.NoError(t, err, "VisitMailboxes() must succeed")
if count != 0 { if count != 0 {
t.Errorf("Got %v total messages, want: %v", count, 0) t.Errorf("Got %v total messages, want: %v", count, 0)
} }

View File

@@ -23,12 +23,12 @@ func TestDoRetentionScan(t *testing.T) {
old1 := stubMessage("mb1", 4) old1 := stubMessage("mb1", 4)
old2 := stubMessage("mb1", 12) old2 := stubMessage("mb1", 12)
old3 := stubMessage("mb2", 24) old3 := stubMessage("mb2", 24)
ds.AddMessage(new1) _, _ = ds.AddMessage(new1)
ds.AddMessage(old1) _, _ = ds.AddMessage(old1)
ds.AddMessage(old2) _, _ = ds.AddMessage(old2)
ds.AddMessage(old3) _, _ = ds.AddMessage(old3)
ds.AddMessage(new2) _, _ = ds.AddMessage(new2)
ds.AddMessage(new3) _, _ = ds.AddMessage(new3)
// Test 4 hour retention // Test 4 hour retention
cfg := config.Storage{ cfg := config.Storage{