From 67cfefde9bacd2ea5f5df0041899ec63ea987219 Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Tue, 4 Mar 2025 17:05:03 +0100
Subject: [PATCH] Fix tests
---
base/config/main.go | 2 ++
service/intel/geoip/init_test.go | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/base/config/main.go b/base/config/main.go
index c737dc2f..25eb4060 100644
--- a/base/config/main.go
+++ b/base/config/main.go
@@ -10,6 +10,7 @@ import (
"path/filepath"
"sort"
+ "github.com/safing/portmaster/base/database/dbmodule"
"github.com/safing/portmaster/base/dataroot"
"github.com/safing/portmaster/base/utils"
"github.com/safing/portmaster/base/utils/debug"
@@ -150,6 +151,7 @@ func InitializeUnitTestDataroot(testName string) (string, error) {
if err != nil {
return "", fmt.Errorf("failed to initialize dataroot: %w", err)
}
+ dbmodule.SetDatabaseLocation(dataroot.Root())
return basePath, nil
}
diff --git a/service/intel/geoip/init_test.go b/service/intel/geoip/init_test.go
index c4d87b33..b6d722dc 100644
--- a/service/intel/geoip/init_test.go
+++ b/service/intel/geoip/init_test.go
@@ -8,7 +8,6 @@ import (
"github.com/safing/portmaster/base/api"
"github.com/safing/portmaster/base/config"
"github.com/safing/portmaster/base/database/dbmodule"
- "github.com/safing/portmaster/base/dataroot"
"github.com/safing/portmaster/base/notifications"
"github.com/safing/portmaster/service/updates"
)
@@ -57,7 +56,6 @@ func runTest(m *testing.M) error {
defer func() { _ = os.RemoveAll(ds) }()
stub := &testInstance{}
- dbmodule.SetDatabaseLocation(dataroot.Root())
stub.db, err = dbmodule.New(stub)
if err != nil {
return fmt.Errorf("failed to create database: %w", err)