Skip to content

Use filepath.clean instead of path.clean #26404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 13, 2023
Merged

Use filepath.clean instead of path.clean #26404

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ef2e44
internal/flags: use filepath.Clean instead of path.Clean
MariusVanDerWijden Jan 2, 2023
77d2778
internal/flags: fix windows pipe issue
MariusVanDerWijden Jan 3, 2023
7c9aa53
internal/flags: modify test for windows
MariusVanDerWijden Jan 9, 2023
cd559a4
internal/flags: use backticks, fix test
MariusVanDerWijden Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions internal/flags/flags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,38 @@ package flags
import (
"os"
"os/user"
"runtime"
"testing"
)

func TestPathExpansion(t *testing.T) {
user, _ := user.Current()
tests := map[string]string{
"/home/someuser/tmp": "/home/someuser/tmp",
"~/tmp": user.HomeDir + "/tmp",
"~thisOtherUser/b/": "~thisOtherUser/b",
"$DDDXXX/a/b": "/tmp/a/b",
"/a/b/": "/a/b",
"C:\\Documents\\Newsletters\\": "C:\\Documents\\Newsletters\\",
"C:\\": "C:\\",
"\\\\.\\pipe\\\\pipe\\geth621383": "\\\\.\\pipe\\\\pipe\\geth621383",
var tests map[string]string

if runtime.GOOS == "windows" {
tests = map[string]string{
"/home/someuser/tmp": "\\home\\someuser\\tmp",
"~/tmp": user.HomeDir + "\\tmp",
"~thisOtherUser/b/": "~thisOtherUser\\b",
"$DDDXXX/a/b": "\\tmp\\a\\b",
"/a/b/": "\\a\\b",
"C:\\Documents\\Newsletters\\": "C:\\Documents\\Newsletters\\",
"C:\\": "C:\\",
"\\\\.\\pipe\\\\pipe\\geth621383": "\\\\.\\pipe\\\\pipe\\geth621383",
}
} else {
tests = map[string]string{
"/home/someuser/tmp": "/home/someuser/tmp",
"~/tmp": user.HomeDir + "/tmp",
"~thisOtherUser/b/": "~thisOtherUser/b",
"$DDDXXX/a/b": "/tmp/a/b",
"/a/b/": "/a/b",
"C:\\Documents\\Newsletters\\": "C:\\Documents\\Newsletters\\",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct? Shouldn't the expansion use / path separators?

Suggested change
"C:\\Documents\\Newsletters\\": "C:\\Documents\\Newsletters\\",
"C:\\Documents\\Newsletters\\": "C:\\Documents\\Newsletters\\",

"C:\\": "C:\\",
"\\\\.\\pipe\\\\pipe\\geth621383": "\\\\.\\pipe\\\\pipe\\geth621383",
}
}

os.Setenv("DDDXXX", "/tmp")
for test, expected := range tests {
got := expandPath(test)
Expand Down