GOMODULES/pgx
1
0
Fork 0
mirror of https://github.com/jackc/pgx.git synced 2025-05-31 11:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #640 from apantel/cockroach-test-cleanup

Browse Source 
Clean up two test cases
This commit is contained in:
Jack Christensen 2019-11-23 09:40:44 -06:00 committed by GitHub
commit 3dc25d5b9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conn_test.go
View File

@ -527,6 +527,7 @@ func TestListenNotifyWhileBusyIsSafe(t *testing.T) {
t.Parallel() t.Parallel()
listenerDone := make(chan bool) listenerDone := make(chan bool)
notifierDone := make(chan bool)
go func() { go func() {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
@ -547,7 +548,9 @@ func TestListenNotifyWhileBusyIsSafe(t *testing.T) {
for rows.Next() { for rows.Next() {
var n int32 var n int32
rows.Scan(&n) if err := rows.Scan(&n); err != nil {
t.Fatalf("Row scan failed: %v", err)
}
sum += n sum += n
rowCount++ rowCount++
} }
@ -571,6 +574,9 @@ func TestListenNotifyWhileBusyIsSafe(t *testing.T) {
go func() { go func() {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
defer func() {
notifierDone <- true
}()
for i := 0; i < 100000; i++ { for i := 0; i < 100000; i++ {
mustExec(t, conn, "notify busysafe, 'hello'") mustExec(t, conn, "notify busysafe, 'hello'")
@ -579,6 +585,7 @@ func TestListenNotifyWhileBusyIsSafe(t *testing.T) {
}() }()
<-listenerDone <-listenerDone
<-notifierDone
} }
func TestListenNotifySelfNotification(t *testing.T) { func TestListenNotifySelfNotification(t *testing.T) {

5
pgxpool/pool_test.go
View File

@ -196,6 +196,7 @@ func TestConnReleaseChecksMaxConnLifetime(t *testing.T) {
config.MaxConnLifetime = 250 * time.Millisecond config.MaxConnLifetime = 250 * time.Millisecond
db, err := pgxpool.ConnectConfig(context.Background(), config) db, err := pgxpool.ConnectConfig(context.Background(), config)
require.NoError(t, err)
defer db.Close() defer db.Close()
c, err := db.Acquire(context.Background()) c, err := db.Acquire(context.Background())
@ -240,6 +241,7 @@ func TestPoolBackgroundChecksMaxConnLifetime(t *testing.T) {
config.HealthCheckPeriod = 100 * time.Millisecond config.HealthCheckPeriod = 100 * time.Millisecond
db, err := pgxpool.ConnectConfig(context.Background(), config) db, err := pgxpool.ConnectConfig(context.Background(), config)
require.NoError(t, err)
defer db.Close() defer db.Close()
c, err := db.Acquire(context.Background()) c, err := db.Acquire(context.Background())
@ -449,7 +451,8 @@ func TestConnReleaseDestroysClosedConn(t *testing.T) {
c, err := pool.Acquire(ctx) c, err := pool.Acquire(ctx)
require.NoError(t, err) require.NoError(t, err)
c.Conn().Close(ctx) err = c.Conn().Close(ctx)
require.NoError(t, err)
assert.EqualValues(t, 1, pool.Stat().TotalConns()) assert.EqualValues(t, 1, pool.Stat().TotalConns())

8
query_test.go
View File

@ -549,11 +549,13 @@ func TestConnQueryErrorWhileReturningRows(t *testing.T) {
for rows.Next() { for rows.Next() {
var n int32 var n int32
rows.Scan(&n) if err := rows.Scan(&n); err != nil {
t.Fatalf("Row scan failed: %v", err)
}
} }
if err, ok := rows.Err().(*pgconn.PgError); !ok { if _, ok := rows.Err().(*pgconn.PgError); !ok {
t.Fatalf("Expected pgx.PgError, got %v", err) t.Fatalf("Expected pgx.PgError, got %v", rows.Err())
} }
ensureConnValid(t, conn) ensureConnValid(t, conn)