From 1913d9eaf05af1c52c56e2e8030a1e806ba74aaf Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Tue, 5 Apr 2022 20:03:18 +0000
Subject: [PATCH] Move migration to init

---
 server/account_test.go |  4 +---
 server/main_test.go    | 12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/server/account_test.go b/server/account_test.go
index a5580f0..e233b41 100644
--- a/server/account_test.go
+++ b/server/account_test.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -18,8 +17,7 @@ func TestRegisterUser(t *testing.T) {
 	t.Parallel()
 	database, err := postgres.Connect("pgtx", cfg.DatabaseConnection)
 	if err != nil {
-		fmt.Printf("could not connect to db: %s\n", err)
-		t.Skip()
+		t.Errorf("connect to DB: %v", err)
 		return
 	}
 
diff --git a/server/main_test.go b/server/main_test.go
index 9311c7a..d396400 100644
--- a/server/main_test.go
+++ b/server/main_test.go
@@ -26,20 +26,20 @@ var cfg = config.Config{ //nolint:gochecknoglobals
 }
 
 func init() { //nolint:gochecknoinits
+	_, err := postgres.Connect("pgx", cfg.DatabaseConnection)
+	if err != nil {
+		log.Fatalf("failed connecting to DB for migrations: %v", err)
+	}
+
 	txdb.Register("pgtx", "pgx", cfg.DatabaseConnection)
 }
 
 func TestMain(t *testing.T) {
 	t.Parallel()
 
-	_, err := postgres.Connect("pgx", cfg.DatabaseConnection)
-	if err != nil {
-		log.Fatalf("Failed connecting to DB: %v", err)
-	}
-
 	queries, err := postgres.Connect("pgtx", cfg.DatabaseConnection)
 	if err != nil {
-		log.Fatalf("Failed connecting to DB: %v", err)
+		t.Errorf("connect to DB: %v", err)
 	}
 
 	static, err := fs.Sub(web.Static, "dist")