gopkg/pgx
2
0
Fork 0
Code Activity

Make TestPoolBackgroundChecksMinConns less timing sensitive for CI

Browse Source
This commit is contained in:
Jack Christensen
2023-06-17 17:34:07 -05:00
parent e5db6a0467
commit f20070650f
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgxpool/pool_test.go
+16 -10
View File
@@ -599,12 +599,15 @@ func TestPoolBackgroundChecksMinConns(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
time.Sleep(config.HealthCheckPeriod + 500*time.Millisecond)
stats := db.Stat() stats := db.Stat()
assert.EqualValues(t, 2, stats.TotalConns()) for !(stats.TotalConns() == 2 && stats.MaxLifetimeDestroyCount() == 0 && stats.NewConnsCount() == 2) || ctx.Err() != nil {
assert.EqualValues(t, 0, stats.MaxLifetimeDestroyCount()) time.Sleep(50 * time.Millisecond)
assert.EqualValues(t, 2, stats.NewConnsCount()) stats = db.Stat()
}
require.NoError(t, ctx.Err())
require.EqualValues(t, 2, stats.TotalConns())
require.EqualValues(t, 0, stats.MaxLifetimeDestroyCount())
require.EqualValues(t, 2, stats.NewConnsCount())
c, err := db.Acquire(ctx) c, err := db.Acquire(ctx)
require.NoError(t, err) require.NoError(t, err)
@@ -612,12 +615,15 @@ func TestPoolBackgroundChecksMinConns(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
c.Release() c.Release()
time.Sleep(config.HealthCheckPeriod + 500*time.Millisecond)
stats = db.Stat() stats = db.Stat()
assert.EqualValues(t, 2, stats.TotalConns()) for !(stats.TotalConns() == 2 && stats.MaxIdleDestroyCount() == 0 && stats.NewConnsCount() == 3) || ctx.Err() != nil {
assert.EqualValues(t, 0, stats.MaxIdleDestroyCount()) time.Sleep(50 * time.Millisecond)
assert.EqualValues(t, 3, stats.NewConnsCount()) stats = db.Stat()
}
require.NoError(t, ctx.Err())
require.EqualValues(t, 2, stats.TotalConns())
require.EqualValues(t, 0, stats.MaxIdleDestroyCount())
require.EqualValues(t, 3, stats.NewConnsCount())
} }
func TestPoolExec(t *testing.T) { func TestPoolExec(t *testing.T) {