chore(osutil): fixup test for symlinked folder root (#10758)

This test was incorrectly rewritten to use fakefs, which doesn't really
test what it's supposed to test.

Signed-off-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
Jakob Borg
2026-06-21 19:48:15 +02:00
committed by GitHub
parent f7f2e7c70b
commit 92ff9ac078

View File

@@ -8,8 +8,10 @@ package osutil_test
import (
"path/filepath"
"slices"
"testing"
"github.com/syncthing/syncthing/lib/build"
"github.com/syncthing/syncthing/lib/fs"
"github.com/syncthing/syncthing/lib/osutil"
"github.com/syncthing/syncthing/lib/rand"
@@ -59,11 +61,16 @@ func TestTraversesSymlink(t *testing.T) {
}
}
func TestIssue4875(t *testing.T) {
testFsPath := rand.String(32)
testFs := fs.NewFilesystem(fs.FilesystemTypeFake, testFsPath)
func TestSymlinkedFSRootTraversal(t *testing.T) {
// Normal FS operations should work inside a folder root that is a symlink
if build.IsWindows {
t.Skip("symlinks unavailable")
}
testFsPath := t.TempDir()
testFs := fs.NewFilesystem(fs.FilesystemTypeBasic, testFsPath)
testFs.MkdirAll(filepath.Join("a", "b", "c"), 0o755)
if err := testFs.CreateSymlink(filepath.Join("a", "b"), filepath.Join("a", "l")); err != nil {
if err := testFs.CreateSymlink("b", filepath.Join("a", "l")); err != nil {
t.Fatal(err)
}
@@ -76,10 +83,21 @@ func TestIssue4875(t *testing.T) {
t.Fatal("error in setup, a/l/c should be a directory")
}
testFs = fs.NewFilesystem(fs.FilesystemTypeFake, filepath.Join(testFsPath, "a/l"))
testFs = fs.NewFilesystem(fs.FilesystemTypeBasic, filepath.Join(testFsPath, "a/l"))
if err := osutil.TraversesSymlink(testFs, "."); err != nil {
t.Error(`TraversesSymlink on filesystem with symlink at root returned error for ".":`, err)
}
// We should be able to create and list files within the symlinked root
if _, err := testFs.Create("test"); err != nil {
t.Fatal(err)
}
if names, err := testFs.DirNames("."); err != nil {
t.Fatal(err)
} else if !slices.Contains(names, "test") {
t.Log(names)
t.Error("missing test file in listing")
}
}
var traversesSymlinkResult error