erius/shad-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix flaky test

Browse source
This commit is contained in:
Fedor Korotkiy 2022-03-31 16:30:47 +03:00
parent f51848efa4
commit 28b48aada9
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pgfixture/pg.go
View file

@ -8,6 +8,9 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"time" "time"
"github.com/stretchr/testify/require"
"gitlab.com/slon/shad-go/tools/testtool"
) )
func lookPath(t *testing.T, name string) string { func lookPath(t *testing.T, name string) string {
@ -50,9 +53,12 @@ func Start(t *testing.T) string {
t.Fatalf("initdb failed: %v", err) t.Fatalf("initdb failed: %v", err)
} }
port, err := testtool.GetFreePort()
require.NoError(t, err)
pgrun := t.TempDir() pgrun := t.TempDir()
cmd = exec.Command(lookPath(t, "postgres"), "-D", pgdata, "-k", pgrun, "-F") cmd = exec.Command(lookPath(t, "postgres"), "-D", pgdata, "-k", pgrun, "-F", "-p", port)
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
@ -75,5 +81,5 @@ func Start(t *testing.T) string {
_ = cmd.Process.Kill() _ = cmd.Process.Kill()
}) })
return fmt.Sprintf("host=%s database=postgres", pgrun) return fmt.Sprintf("host=localhost port=%s database=postgres", port)
} }