integ-cli: Fix TestBuildAddBadLinks for windows #10871
Conversation
|
| @@ -1568,7 +1569,18 @@ func TestBuildAddBadLinks(t *testing.T) { | |||
| } | |||
| defer os.RemoveAll(tempDir) | |||
|
|
|||
| symlinkTarget := fmt.Sprintf("/../../../../../../../../../../../..%s", tempDir) | |||
| var symlinkTarget string | |||
There was a problem hiding this comment.
Isn't possible to make this with filepath.Join without runtime.GOOS comparing?
There was a problem hiding this comment.
@LK4D4 great idea but as far as I can tell, no:
filepath.Join("/", "foo", "bar") → "\\foo\bar" (not a valid URL on windows)
since we need the volume letter (c:) at the beginning I might give a full URL of where we're running:
filepath.Join(os.Getwd(), "..","..","..","..","..","..","..","..", "foo") → "c:\foo"
is still not what I want since filepath.Join clears the path from unnecessary stuff like "..". Any other ideas?
There was a problem hiding this comment.
Makes sense considering filepath.Join doc:
The result is Cleaned, in particular all empty strings are ignored.
There was a problem hiding this comment.
I remember also there was filepath.Separator or smth like that also. Not sure it worth it.
There was a problem hiding this comment.
@LK4D4 you're right. it might help a bit but we still need to get the volume name c: somehow.
TestBuildAddBadLinks used to build a path by concenating unix-style forward slashes. Fixed that by providing a windows-equivalent using `runtime.GOOS`. Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
|
Pushed the fix on this. Please review again. |
|
Wondering; would |
|
@thaJeztah not really. file:// doesn't work with pkg/os. |
|
@ahmetalpbalkan thanks. Kind of suspected it would be "too good to be true". |
|
LGTM |
1 similar comment
|
LGTM |
…Links-fix integ-cli: Fix TestBuildAddBadLinks for windows
TestBuildAddBadLinks used to build a path by
concenating unix-style forward slashes. Fixed that
by providing a windows-equivalent using
runtime.GOOS.Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
cc: @unclejack @jfrazelle @icecrime @tiborvass