felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib/fs: Fix root path handling for Windows (fixes #8778)

Browse Source 
Co-authored-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
Ross Smith II
2023-05-09 10:01:57 +00:00
committed by Jakob Borg
co-authored by Jakob Borg
parent 1103a27337
commit 3adfe2f91f
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/fs/basicfs_windows_test.go
+23 -6
View File
@@ -12,29 +12,46 @@ package fs
import (
"os"
"path/filepath"
"runtime"
"strings"
"syscall"
"testing"
)
func TestWindowsPaths(t *testing.T) {
testCases := []struct {
type testCase struct {
input string
expectedRoot string
expectedURI string
}{
}
testCases := []testCase{
{`e:`, `\\?\e:\`, `e:\`},
{`e:\`, `\\?\e:\`, `e:\`},
{`e:\\`, `\\?\e:\`, `e:\`},
{`\\?\e:`, `\\?\e:\`, `e:\`},
{`\\?\e:\`, `\\?\e:\`, `e:\`},
{`\\?\e:\\`, `\\?\e:\`, `e:\`},
{`e:\x`, `\\?\e:\x`, `e:\x`},
{`e:\x\`, `\\?\e:\x`, `e:\x`},
{`e:\x\\`, `\\?\e:\x`, `e:\x`},
{`\\192.0.2.22\network\share`, `\\192.0.2.22\network\share`, `\\192.0.2.22\network\share`},
}
for _, testCase := range testCases {
if runtime.Version() >= "go1.20" {
testCases = append(testCases,
testCase{`\\.\e:`, `\\.\e:\`, `e:\`},
testCase{`\\.\e:\`, `\\.\e:\`, `e:\`},
testCase{`\\.\e:\\`, `\\.\e:\`, `e:\`},
)
}
for i, testCase := range testCases {
fs := newBasicFilesystem(testCase.input)
if fs.root != testCase.expectedRoot {
t.Errorf("root %q != %q", fs.root, testCase.expectedRoot)
t.Errorf("test %d: root: expected `%s`, got `%s`", i, testCase.expectedRoot, fs.root)
}
if fs.URI() != testCase.expectedURI {
t.Errorf("uri %q != %q", fs.URI(), testCase.expectedURI)
t.Errorf("test %d: uri: expected `%s`, got `%s`", i, testCase.expectedURI, fs.URI())
}
}
@@ -195,7 +212,7 @@ func TestGetFinalPath(t *testing.T) {
}
func TestRemoveWindowsDirIcon(t *testing.T) {
//Try to delete a folder with a custom icon with os.Remove (simulated by the readonly file attribute)
// Try to delete a folder with a custom icon with os.Remove (simulated by the readonly file attribute)
fs, dir := setup(t)
relativePath := "folder_with_icon"