Skip to content

Commit 5555b5c

Browse files
committed
Fix redshift tests
1 parent d03df97 commit 5555b5c

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

database/redshift/redshift_test.go

+17-16
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,31 @@ import (
88
"database/sql"
99
sqldriver "database/sql/driver"
1010
"fmt"
11-
"log"
12-
11+
"github.com/dhui/dktest"
1312
"github.com/golang-migrate/migrate/v4"
13+
"github.com/golang-migrate/migrate/v4/database"
14+
dt "github.com/golang-migrate/migrate/v4/database/testing"
15+
"github.com/golang-migrate/migrate/v4/dktesting"
16+
_ "github.com/golang-migrate/migrate/v4/source/file"
1417
"io"
18+
"log"
1519
"strconv"
1620
"strings"
1721
"testing"
1822
)
1923

20-
import (
21-
"github.com/dhui/dktest"
22-
)
23-
24-
import (
25-
"github.com/golang-migrate/migrate/v4/database"
26-
dt "github.com/golang-migrate/migrate/v4/database/testing"
27-
"github.com/golang-migrate/migrate/v4/dktesting"
28-
_ "github.com/golang-migrate/migrate/v4/source/file"
24+
const (
25+
pgPassword = "postgres"
2926
)
3027

3128
var (
32-
opts = dktest.Options{PortRequired: true, ReadyFunc: isReady}
29+
opts = dktest.Options{
30+
Env: map[string]string{"POSTGRES_PASSWORD": pgPassword},
31+
PortRequired: true,
32+
ReadyFunc: isReady,
33+
}
3334
specs = []dktesting.ContainerSpec{
34-
{ImageName: "postgres:8", Options: opts},
35+
{ImageName: "postgres:12", Options: opts},
3536
}
3637
)
3738

@@ -44,7 +45,7 @@ func pgConnectionString(host, port string) string {
4445
}
4546

4647
func connectionString(schema, host, port string) string {
47-
return fmt.Sprintf("%s://postgres@%s:%s/postgres?sslmode=disable", schema, host, port)
48+
return fmt.Sprintf("%s://postgres:%s@%s:%s/postgres?sslmode=disable", schema, pgPassword, host, port)
4849
}
4950

5051
func isReady(ctx context.Context, c dktest.ContainerInfo) bool {
@@ -192,7 +193,7 @@ func TestFilterCustomQuery(t *testing.T) {
192193
t.Fatal(err)
193194
}
194195

195-
addr := fmt.Sprintf("postgres://postgres@%v:%v/postgres?sslmode=disable&x-custom=foobar", ip, port)
196+
addr := fmt.Sprintf("postgres://postgres:%s@%s:%s/postgres?sslmode=disable&x-custom=foobar", pgPassword, ip, port)
196197
p := &Redshift{}
197198
d, err := p.Open(addr)
198199
if err != nil {
@@ -234,7 +235,7 @@ func TestWithSchema(t *testing.T) {
234235
}
235236

236237
// re-connect using that schema
237-
d2, err := p.Open(fmt.Sprintf("postgres://postgres@%v:%v/postgres?sslmode=disable&search_path=foobar", ip, port))
238+
d2, err := p.Open(fmt.Sprintf("postgres://postgres:%s@%s:%s/postgres?sslmode=disable&search_path=foobar", pgPassword, ip, port))
238239
if err != nil {
239240
t.Fatal(err)
240241
}

0 commit comments

Comments
 (0)