Fix tests when PGUSER is different than OS user
This commit is contained in:
+15
-6
@@ -27,8 +27,10 @@ func getDefaultPort(t *testing.T) uint16 {
|
|||||||
return 5432
|
return 5432
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestParseConfig(t *testing.T) {
|
func getDefaultUser(t *testing.T) string {
|
||||||
t.Parallel()
|
if pguser := os.Getenv("PGUSER"); pguser != "" {
|
||||||
|
return pguser
|
||||||
|
}
|
||||||
|
|
||||||
var osUserName string
|
var osUserName string
|
||||||
osUser, err := user.Current()
|
osUser, err := user.Current()
|
||||||
@@ -42,10 +44,17 @@ func TestParseConfig(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return osUserName
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseConfig(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
config, err := pgconn.ParseConfig("")
|
config, err := pgconn.ParseConfig("")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defaultHost := config.Host
|
defaultHost := config.Host
|
||||||
|
|
||||||
|
defaultUser := getDefaultUser(t)
|
||||||
defaultPort := getDefaultPort(t)
|
defaultPort := getDefaultPort(t)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@@ -215,7 +224,7 @@ func TestParseConfig(t *testing.T) {
|
|||||||
name: "database url missing user and password",
|
name: "database url missing user and password",
|
||||||
connString: "postgres://localhost:5432/mydb?sslmode=disable",
|
connString: "postgres://localhost:5432/mydb?sslmode=disable",
|
||||||
config: &pgconn.Config{
|
config: &pgconn.Config{
|
||||||
User: osUserName,
|
User: defaultUser,
|
||||||
Host: "localhost",
|
Host: "localhost",
|
||||||
Port: 5432,
|
Port: 5432,
|
||||||
Database: "mydb",
|
Database: "mydb",
|
||||||
@@ -240,7 +249,7 @@ func TestParseConfig(t *testing.T) {
|
|||||||
name: "database url unix domain socket host",
|
name: "database url unix domain socket host",
|
||||||
connString: "postgres:///foo?host=/tmp",
|
connString: "postgres:///foo?host=/tmp",
|
||||||
config: &pgconn.Config{
|
config: &pgconn.Config{
|
||||||
User: osUserName,
|
User: defaultUser,
|
||||||
Host: "/tmp",
|
Host: "/tmp",
|
||||||
Port: defaultPort,
|
Port: defaultPort,
|
||||||
Database: "foo",
|
Database: "foo",
|
||||||
@@ -252,7 +261,7 @@ func TestParseConfig(t *testing.T) {
|
|||||||
name: "database url unix domain socket host on windows",
|
name: "database url unix domain socket host on windows",
|
||||||
connString: "postgres:///foo?host=C:\\tmp",
|
connString: "postgres:///foo?host=C:\\tmp",
|
||||||
config: &pgconn.Config{
|
config: &pgconn.Config{
|
||||||
User: osUserName,
|
User: defaultUser,
|
||||||
Host: "C:\\tmp",
|
Host: "C:\\tmp",
|
||||||
Port: defaultPort,
|
Port: defaultPort,
|
||||||
Database: "foo",
|
Database: "foo",
|
||||||
@@ -264,7 +273,7 @@ func TestParseConfig(t *testing.T) {
|
|||||||
name: "database url dbname",
|
name: "database url dbname",
|
||||||
connString: "postgres://localhost/?dbname=foo&sslmode=disable",
|
connString: "postgres://localhost/?dbname=foo&sslmode=disable",
|
||||||
config: &pgconn.Config{
|
config: &pgconn.Config{
|
||||||
User: osUserName,
|
User: defaultUser,
|
||||||
Host: "localhost",
|
Host: "localhost",
|
||||||
Port: defaultPort,
|
Port: defaultPort,
|
||||||
Database: "foo",
|
Database: "foo",
|
||||||
|
|||||||
Reference in New Issue
Block a user