commit 50a04ddb520fbd12866e3b10ada4f31b61649eb9
parent 169eb8ab5951e1a006becf2fcdc019ae9c6e7c70
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Sun, 15 Feb 2026 08:39:42 +0100
fix tests
Diffstat:
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/cmd/taldir-server/main_test.go b/cmd/taldir-server/main_test.go
@@ -102,17 +102,17 @@ func TestMain(m *testing.M) {
if err != nil {
log.Fatalf("Failed to read config: %v", err)
}
- psqlconn := fmt.Sprintf("host=%s port=%d dbname=%s sslmode=disable",
- cfg.Section("taldir-pq").Key("host").MustString("localhost"),
- cfg.Section("taldir-pq").Key("port").MustInt64(5432),
- cfg.Section("taldir-pq").Key("db_name").MustString("taler-directory"))
+ psqlconn := cfg.Section("taldir-pq").Key("connection_string").MustString("postgres:///taler-directory")
+ segments := strings.Split(strings.Split(psqlconn, "?")[0], "/")
+ dbName := segments[len(segments)-1]
+
db, err := sql.Open("postgres", psqlconn)
if err != nil {
log.Panic(err)
}
defer db.Close()
- err = taldir.DBInit(db, "../..", "taler-directory")
+ err = taldir.DBInit(db, "../..", dbName)
if err != nil {
log.Fatalf("Failed to apply versioning or patches: %v", err)
}
diff --git a/cmd/taldir-server/testdata/taldir-test.conf b/cmd/taldir-server/testdata/taldir-test.conf
@@ -30,8 +30,4 @@ type = command
enabled = true
[taldir-pq]
-host = "localhost"
-port = 5432
-user = "taldir"
-password = "secret"
-db_name = "taler-directory"
+connection_string = postgres:///taler-directory?host=/var/run/postgresql