Skip to content

Commit 7300b9e

Browse files
kolyshkingopherbot
authored andcommitted
internal/testenv: simplify hasSymlink for windows
1. Combine two functions into one. 2. Use errors.Is to check for wrapped errors. 3. Use sync.OnceValues. Change-Id: I25f55d31bb658ff08da209b1740e9dff579cca69 Reviewed-on: https://go-review.googlesource.com/c/go/+/609797 Reviewed-by: Ian Lance Taylor <[email protected]> Auto-Submit: Ian Lance Taylor <[email protected]> Reviewed-by: Alan Donovan <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Commit-Queue: Ian Lance Taylor <[email protected]>
1 parent b648cd6 commit 7300b9e

File tree

1 file changed

+7
-22
lines changed

1 file changed

+7
-22
lines changed

src/internal/testenv/testenv_windows.go

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,28 @@
55
package testenv
66

77
import (
8+
"errors"
89
"os"
910
"path/filepath"
1011
"sync"
1112
"syscall"
1213
)
1314

14-
var symlinkOnce sync.Once
15-
var winSymlinkErr error
16-
17-
func initWinHasSymlink() {
15+
var hasSymlink = sync.OnceValues(func() (bool, string) {
1816
tmpdir, err := os.MkdirTemp("", "symtest")
1917
if err != nil {
2018
panic("failed to create temp directory: " + err.Error())
2119
}
2220
defer os.RemoveAll(tmpdir)
2321

2422
err = os.Symlink("target", filepath.Join(tmpdir, "symlink"))
25-
if err != nil {
26-
err = err.(*os.LinkError).Err
27-
switch err {
28-
case syscall.EWINDOWS, syscall.ERROR_PRIVILEGE_NOT_HELD:
29-
winSymlinkErr = err
30-
}
31-
}
32-
}
33-
34-
func hasSymlink() (ok bool, reason string) {
35-
symlinkOnce.Do(initWinHasSymlink)
36-
37-
switch winSymlinkErr {
38-
case nil:
23+
switch {
24+
case err == nil:
3925
return true, ""
40-
case syscall.EWINDOWS:
26+
case errors.Is(err, syscall.EWINDOWS):
4127
return false, ": symlinks are not supported on your version of Windows"
42-
case syscall.ERROR_PRIVILEGE_NOT_HELD:
28+
case errors.Is(err, syscall.ERROR_PRIVILEGE_NOT_HELD):
4329
return false, ": you don't have enough privileges to create symlinks"
4430
}
45-
4631
return false, ""
47-
}
32+
})

0 commit comments

Comments
 (0)