Skip to content

[+] add new testutil package #1064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pashagolub merged 12 commits into from
Dec 5, 2025
Merged

[+] add new testutil package #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dbf0abd
Move pg container setup logic to `TestMain()`.
0xgouda Dec 2, 2025
0c94a24
Fix linter errors.
0xgouda Dec 2, 2025
3a02222
Move `sinks` package test helpers to new `testutils` package.
0xgouda Dec 3, 2025
977c00a
Fix linter errors
0xgouda Dec 3, 2025
35d20c6
Use different file structure in `testutil`.
0xgouda Dec 4, 2025
9f2cd34
Don't use `pgContainer` as a global variable.
0xgouda Dec 4, 2025
121d6f9
rm `main_test.go` its not neccessary now.
0xgouda Dec 4, 2025
1fe90f2
Rename `helper_vars.go` to `types.go`.
0xgouda Dec 4, 2025
61c6e76
Add `MockDatabase` const, for the pg container datname.
0xgouda Dec 4, 2025
262254d
Revert `rpc_test.go` back to be in `sinks_test` package.
0xgouda Dec 5, 2025
85984cd
add tests to increase coverage
pashagolub Dec 5, 2025
827c4dc
make linter happy
pashagolub Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/sinks/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Package sinks rovides functionality to store monitored data in different ways.
// Package sinks provides functionality to store monitored data in different ways.
//
// At the moment we provide sink connectors for
// - PostgreSQL and flavours,
Expand Down
69 changes: 19 additions & 50 deletions internal/sinks/postgres_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ import (

"github.com/cybertec-postgresql/pgwatch/v3/internal/log"
"github.com/cybertec-postgresql/pgwatch/v3/internal/metrics"
"github.com/cybertec-postgresql/pgwatch/v3/internal/testutil"
"github.com/jackc/pgx/v5"
jsoniter "github.com/json-iterator/go"
"github.com/pashagolub/pgxmock/v4"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
testcontainers "github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/modules/postgres"
"github.com/testcontainers/testcontainers-go/wait"
)

var ctx = log.WithLogger(context.Background(), log.NewNoopLogger())
Expand Down Expand Up @@ -461,19 +459,13 @@ func TestCopyFromMeasurements_StateManagement(t *testing.T) {
func TestCopyFromMeasurements_CopyFail(t *testing.T) {
a := assert.New(t)
r := require.New(t)
const ImageName = "docker.io/postgres:17-alpine"
pgContainer, err := postgres.Run(ctx,
ImageName,
postgres.WithDatabase("mydatabase"),
testcontainers.WithWaitStrategy(
wait.ForLog("database system is ready to accept connections").
WithOccurrence(2).
WithStartupTimeout(5*time.Second)),
)

pgContainer, pgTearDown, err := testutil.SetupPostgresContainer()
r.NoError(err)
defer func() { assert.NoError(t, pgContainer.Terminate(ctx)) }()
defer pgTearDown()

connStr, _ := pgContainer.ConnectionString(ctx, "sslmode=disable")
connStr, err := pgContainer.ConnectionString(ctx, "sslmode=disable")
r.NoError(err)
conn, err := pgx.Connect(ctx, connStr)
r.NoError(err)

Expand Down Expand Up @@ -513,21 +505,13 @@ func TestCopyFromMeasurements_CopyFail(t *testing.T) {
// cli flags that expect a PostgreSQL interval string
func TestIntervalValidation(t *testing.T) {
a := assert.New(t)
r := require.New(t)

const ImageName = "docker.io/postgres:17-alpine"
pgContainer, err := postgres.Run(ctx,
ImageName,
postgres.WithDatabase("mydatabase"),
testcontainers.WithWaitStrategy(
wait.ForLog("database system is ready to accept connections").
WithOccurrence(2).
WithStartupTimeout(5*time.Second)),
)
r.NoError(err)
defer func() { a.NoError(pgContainer.Terminate(ctx)) }()
pgContainer, pgTearDown, err := testutil.SetupPostgresContainer()
a.NoError(err)
defer pgTearDown()

connStr, _ := pgContainer.ConnectionString(ctx, "sslmode=disable")
connStr, err := pgContainer.ConnectionString(ctx, "sslmode=disable")
a.NoError(err)

opts := &CmdOpts{
PartitionInterval: "1 minute",
Expand Down Expand Up @@ -589,19 +573,12 @@ func TestPartitionInterval(t *testing.T) {
a := assert.New(t)
r := require.New(t)

const ImageName = "docker.io/postgres:17-alpine"
pgContainer, err := postgres.Run(ctx,
ImageName,
postgres.WithDatabase("mydatabase"),
testcontainers.WithWaitStrategy(
wait.ForLog("database system is ready to accept connections").
WithOccurrence(2).
WithStartupTimeout(5*time.Second)),
)
pgContainer, pgTearDown, err := testutil.SetupPostgresContainer()
r.NoError(err)
defer func() { a.NoError(pgContainer.Terminate(ctx)) }()
defer pgTearDown()

connStr, _ := pgContainer.ConnectionString(ctx, "sslmode=disable")
connStr, err := pgContainer.ConnectionString(ctx, "sslmode=disable")
r.NoError(err)

opts := &CmdOpts{
PartitionInterval: "3 weeks",
Expand Down Expand Up @@ -642,20 +619,12 @@ func Test_MaintainUniqueSources_DeleteOldPartitions(t *testing.T) {
a := assert.New(t)
r := require.New(t)

// TODO: move postgres container setup to TestMain()
const ImageName = "docker.io/postgres:17-alpine"
pgContainer, err := postgres.Run(ctx,
ImageName,
postgres.WithDatabase("mydatabase"),
testcontainers.WithWaitStrategy(
wait.ForLog("database system is ready to accept connections").
WithOccurrence(2).
WithStartupTimeout(5*time.Second)),
)
pgContainer, pgTearDown, err := testutil.SetupPostgresContainer()
r.NoError(err)
defer func() { a.NoError(pgContainer.Terminate(ctx)) }()
defer pgTearDown()

connStr, _ := pgContainer.ConnectionString(ctx, "sslmode=disable")
connStr, err := pgContainer.ConnectionString(ctx, "sslmode=disable")
r.NoError(err)
conn, err := pgx.Connect(ctx, connStr)
r.NoError(err)

Expand Down
Loading
Loading