github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

v2 tests fix (#1956)

Browse Source 
* v2 tests fix
* test: added tests for sqlite
This commit is contained in:
Alexandr Stelnykovych
2025-08-07 02:04:38 +03:00
committed by GitHub
parent 5609594b2a
commit 58f4058633
15 changed files with 347 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
base/database/database_test.go
View File

@@ -18,6 +18,7 @@ import (
_ "github.com/safing/portmaster/base/database/storage/bbolt"
_ "github.com/safing/portmaster/base/database/storage/fstree"
_ "github.com/safing/portmaster/base/database/storage/hashmap"
_ "github.com/safing/portmaster/base/database/storage/sqlite"
)
func TestMain(m *testing.M) {
@@ -166,7 +167,7 @@ func testDatabase(t *testing.T, storageType string, shadowDelete bool) { //nolin
}
// run maintenance
err = dbController.MaintainRecordStates(context.TODO(), now.Add(-60*time.Second))
err = dbController.MaintainRecordStates(t.Context(), now.Add(-60*time.Second))
if err != nil {
t.Fatal(err)
}
@@ -181,12 +182,22 @@ func testDatabase(t *testing.T, storageType string, shadowDelete bool) { //nolin
if !errors.Is(err, storage.ErrNotFound) {
t.Errorf("A should be deleted and purged, err=%s", err)
}
B1, err := dbController.storage.Get("B")
if err != nil {
t.Fatalf("should exist: %s, original meta: %+v", err, B.Meta())
}
if B1.Meta().Deleted == 0 {
t.Errorf("B should be deleted")
if !shadowDelete {
// previous call MaintainRecordStates() must purge all expired and deleted records
_, err := dbController.storage.Get("B")
if !errors.Is(err, storage.ErrNotFound) {
t.Errorf("B should be deleted and purged, err=%s", err)
}
} else {
B1, err := dbController.storage.Get("B")
if err != nil {
t.Fatalf("should exist: %s, original meta: %+v", err, B.Meta())
}
if B1.Meta().Deleted == 0 {
t.Errorf("B should be deleted")
}
}
// delete last entry
@@ -197,7 +208,9 @@ func testDatabase(t *testing.T, storageType string, shadowDelete bool) { //nolin
}
// run maintenance
err = dbController.MaintainRecordStates(context.TODO(), now)
// Since previous call MaintainRecordStates() saved actual timestamp for deleted records,
// use 'now + 1sec' just to guarantee that time is bigger)
err = dbController.MaintainRecordStates(t.Context(), time.Now().Add(time.Second).UTC())
if err != nil {
t.Fatal(err)
}
@@ -251,6 +264,7 @@ func TestDatabaseSystem(t *testing.T) { //nolint:tparallel
}()
for _, shadowDelete := range []bool{false, true} {
testDatabase(t, "sqlite", shadowDelete)
testDatabase(t, "bbolt", shadowDelete)
testDatabase(t, "hashmap", shadowDelete)
testDatabase(t, "fstree", shadowDelete)

12
base/utils/structure_test.go
View File

@@ -28,12 +28,12 @@ func ExampleDirStructure() {
return
}
ds := NewDirStructure(basePath, PublicReadPermission)
secret := ds.ChildDir("secret", AdminOnlyPermission)
repo := ds.ChildDir("repo", PublicWritePermission)
_ = repo.ChildDir("a", AdminOnlyPermission)
b := repo.ChildDir("b", PublicReadPermission)
c := b.ChildDir("c", PublicWritePermission)
ds := NewDirStructure(basePath, PublicReadExecPermission)
secret := ds.ChildDir("secret", AdminOnlyExecPermission)
repo := ds.ChildDir("repo", PublicWriteExecPermission)
_ = repo.ChildDir("a", AdminOnlyExecPermission)
b := repo.ChildDir("b", PublicReadExecPermission)
c := b.ChildDir("c", PublicWriteExecPermission)
err = ds.Ensure()
if err != nil {