chore: t.Parallel() + move poll test to own file

This commit is contained in:
Milas Bowman 2025-03-09 21:47:10 -04:00
parent 231423cd0b
commit 0bdd3dfef8
Signed by: milas
SSH key fingerprint: SHA256:ek2D5l1HA34B3wbdErz0QOXm1E46CVvyf/nM4Fwfx/U
5 changed files with 77 additions and 48 deletions

View file

@ -1,16 +1,12 @@
package k2v_test
import (
k2v "code.notaphish.fyi/milas/garage-k2v-go"
"context"
"github.com/stretchr/testify/require"
"math/rand/v2"
"net/http/httptrace"
"strconv"
"testing"
"time"
k2v "code.notaphish.fyi/milas/garage-k2v-go"
"github.com/stretchr/testify/require"
"go.uber.org/goleak"
)
type fixture struct {
@ -22,11 +18,6 @@ type fixture struct {
func newFixture(t testing.TB) (*fixture, context.Context) {
t.Helper()
t.Cleanup(func() {
goleak.VerifyNone(t)
})
ctx := testContext(t)
cli := k2v.NewClient(k2v.EndpointFromEnv(), k2v.KeyFromEnv())
@ -53,18 +44,21 @@ func randomKey() string {
}
func TestClient_InsertItem(t *testing.T) {
t.Parallel()
f, ctx := newFixture(t)
err := f.cli.InsertItem(ctx, f.bucket, randomKey(), randomKey(), "", []byte("hello"))
require.NoError(t, err)
}
func TestClient_ReadItemNotExist(t *testing.T) {
t.Parallel()
f, ctx := newFixture(t)
pk := randomKey()
sk := randomKey()
t.Run("Single", func(t *testing.T) {
t.Parallel()
item, ct, err := f.cli.ReadItemSingle(ctx, f.bucket, pk, sk)
require.ErrorIs(t, err, k2v.NoSuchItemErr)
require.Nil(t, item)
@ -72,6 +66,7 @@ func TestClient_ReadItemNotExist(t *testing.T) {
})
t.Run("Multi", func(t *testing.T) {
t.Parallel()
items, ct, err := f.cli.ReadItemMulti(ctx, f.bucket, pk, sk)
require.ErrorIs(t, err, k2v.NoSuchItemErr)
require.Empty(t, items)
@ -80,6 +75,7 @@ func TestClient_ReadItemNotExist(t *testing.T) {
}
func TestClient_ReadItemTombstone(t *testing.T) {
t.Parallel()
f, ctx := newFixture(t)
pk := randomKey()
@ -110,6 +106,7 @@ func TestClient_ReadItemTombstone(t *testing.T) {
}
func TestClient_ReadItemSingleRevision(t *testing.T) {
t.Parallel()
f, ctx := newFixture(t)
pk := randomKey()
@ -119,6 +116,7 @@ func TestClient_ReadItemSingleRevision(t *testing.T) {
require.NoError(t, err)
t.Run("Single", func(t *testing.T) {
t.Parallel()
item, ct, err := f.cli.ReadItemSingle(ctx, f.bucket, pk, sk)
require.NoError(t, err)
require.Equal(t, "hello", string(item))
@ -126,6 +124,7 @@ func TestClient_ReadItemSingleRevision(t *testing.T) {
})
t.Run("Multi", func(t *testing.T) {
t.Parallel()
items, ct, err := f.cli.ReadItemMulti(ctx, f.bucket, pk, sk)
require.NoError(t, err)
require.Len(t, items, 1)
@ -135,6 +134,7 @@ func TestClient_ReadItemSingleRevision(t *testing.T) {
}
func TestClient_ReadItemMultipleRevisions(t *testing.T) {
t.Parallel()
f, ctx := newFixture(t)
pk := randomKey()
@ -148,6 +148,7 @@ func TestClient_ReadItemMultipleRevisions(t *testing.T) {
require.NoError(t, err)
t.Run("Single", func(t *testing.T) {
t.Parallel()
item, ct, err := f.cli.ReadItemSingle(ctx, f.bucket, pk, sk)
require.ErrorIs(t, err, k2v.ConcurrentItemsErr)
require.Nil(t, item)
@ -155,6 +156,7 @@ func TestClient_ReadItemMultipleRevisions(t *testing.T) {
})
t.Run("Multi", func(t *testing.T) {
t.Parallel()
items, ct, err := f.cli.ReadItemMulti(ctx, f.bucket, pk, sk)
require.NoError(t, err)
require.Len(t, items, 2)
@ -163,38 +165,3 @@ func TestClient_ReadItemMultipleRevisions(t *testing.T) {
require.NotEmpty(t, ct)
})
}
func TestClient_PollItem(t *testing.T) {
f, ctx := newFixture(t)
pk := randomKey()
sk := randomKey()
err := f.cli.InsertItem(ctx, f.bucket, pk, sk, "", []byte("hello1"))
require.NoError(t, err)
_, ct, err := f.cli.ReadItemSingle(ctx, f.bucket, pk, sk)
pollReadyCh := make(chan struct{})
go func(ct k2v.CausalityToken) {
select {
case <-ctx.Done():
t.Errorf("Context canceled: %v", ctx.Err())
return
case <-pollReadyCh:
t.Logf("PollItem connected")
}
err = f.cli.InsertItem(ctx, f.bucket, pk, sk, ct, []byte("hello2"))
require.NoError(t, err)
}(ct)
trace := &httptrace.ClientTrace{
WroteRequest: func(_ httptrace.WroteRequestInfo) {
pollReadyCh <- struct{}{}
},
}
item, ct, err := f.cli.PollItem(httptrace.WithClientTrace(ctx, trace), f.bucket, pk, sk, ct, 5*time.Second)
require.NoError(t, err)
require.Equal(t, "hello2", string(item))
require.NotEmpty(t, ct)
}