From ee7bda446dc0a9c27d0ef524fd7aa37cb4fb110d Mon Sep 17 00:00:00 2001 From: crn4 Date: Fri, 31 Oct 2025 15:46:16 +0100 Subject: [PATCH] fix tests --- management/server/store/sql_store.go | 4 ++-- management/server/store/sqlstore_bench_test.go | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/management/server/store/sql_store.go b/management/server/store/sql_store.go index 489c14702..b3e2e25cb 100644 --- a/management/server/store/sql_store.go +++ b/management/server/store/sql_store.go @@ -1230,9 +1230,9 @@ func (s *SqlStore) getAccount(ctx context.Context, accountID string) (*types.Acc ) if err != nil { if errors.Is(err, pgx.ErrNoRows) { - return nil, errors.New("account not found") + return nil, status.NewAccountNotFoundError(accountID) } - return nil, err + return nil, status.NewGetAccountFromStoreError(err) } _ = json.Unmarshal(networkNet, &account.Network.Net) diff --git a/management/server/store/sqlstore_bench_test.go b/management/server/store/sqlstore_bench_test.go index 10c6385ed..85b76f4c3 100644 --- a/management/server/store/sqlstore_bench_test.go +++ b/management/server/store/sqlstore_bench_test.go @@ -25,6 +25,7 @@ import ( networkTypes "github.com/netbirdio/netbird/management/server/networks/types" nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/posture" + "github.com/netbirdio/netbird/management/server/testutil" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/route" "github.com/netbirdio/netbird/shared/management/status" @@ -242,8 +243,12 @@ func connectDBforTest(ctx context.Context, dsn string) (*pgxpool.Pool, error) { return pool, nil } -func setupBenchmarkDB(b testing.TB) (*SqlStore, string) { - dsn := "host=localhost user=postgres password=mysecretpassword dbname=testdb port=5432 sslmode=disable TimeZone=Europe/Berlin" +func setupBenchmarkDB(b testing.TB) (*SqlStore, func(), string) { + cleanup, dsn, err := testutil.CreatePostgresTestContainer() + if err != nil { + b.Fatalf("failed to create test container: %v", err) + } + db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) if err != nil { b.Fatalf("failed to connect database: %v", err) @@ -484,11 +489,12 @@ func setupBenchmarkDB(b testing.TB) (*SqlStore, string) { b.Fatalf("create onboarding: %v", err) } - return store, accountID + return store, cleanup, accountID } func BenchmarkGetAccount(b *testing.B) { - store, accountID := setupBenchmarkDB(b) + store, cleanup, accountID := setupBenchmarkDB(b) + defer cleanup() ctx := context.Background() b.ResetTimer() b.ReportAllocs() @@ -520,7 +526,8 @@ func BenchmarkGetAccount(b *testing.B) { } func TestAccountEquivalence(t *testing.T) { - store, accountID := setupBenchmarkDB(t) + store, cleanup, accountID := setupBenchmarkDB(t) + defer cleanup() ctx := context.Background() type getAccountFunc func(context.Context, string) (*types.Account, error)