Merge pull request #225 from motemen/fix-win-helper

refactor test helpers
x-motemen · Dec 18, 2019 · ad6895c · ad6895c
2 parents 49090e8 + 7be651a
commit ad6895c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/helpers_test.go b/helpers_test.go
@@ -112,7 +112,11 @@ func newTempDir(t *testing.T) string {
 		t.Fatalf("os.Getwd(): %s", err)
 	}
 
-	return toFullPath(tmpdir)
+	s, err := toFullPath(tmpdir)
+	if err != nil {
+		t.Fatalf("toFullPath(%q): %s", tmpdir, err)
+	}
+	return s
 }
 
 func tmpEnv(key, val string) func() {

diff --git a/helpers_unix.go b/helpers_unix.go
@@ -2,6 +2,6 @@
 
 package main
 
-func toFullPath(s string) string {
-	return s
+func toFullPath(s string) (string, error) {
+	return s, nil
 }
diff --git a/helpers_windows.go b/helpers_windows.go
@@ -4,22 +4,20 @@ package main
 
 import "syscall"
 
-func toFullPath(s string) string {
+func toFullPath(s string) (string, error) {
 	p := syscall.StringToUTF16(s)
 	b := p
 	n, err := syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
 	if err != nil {
-		println("error", err.Error())
-		return s
+		return s, err
 	}
 	if n > uint32(len(b)) {
 		b = make([]uint16, n)
 		n, err = syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
 		if err != nil {
-			println("error", err.Error())
-			return s
+			return s, err
 		}
 	}
 	b = b[:n]
-	return syscall.UTF16ToString(b)
+	return syscall.UTF16ToString(b), nil
 }