From 7be651ad8475767bcb7e6a413455829bc6c562e0 Mon Sep 17 00:00:00 2001
From: Songmu <y.songmu@gmail.com>
Date: Thu, 19 Dec 2019 02:21:20 +0900
Subject: [PATCH] refactor test helpers

---
 helpers_test.go    |  6 +++++-
 helpers_unix.go    |  4 ++--
 helpers_windows.go | 10 ++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/helpers_test.go b/helpers_test.go
index 483f58e..6602986 100644
--- 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
index 4d79c4f..6ceaa35 100644
--- 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
index 36027d8..f6cfbfd 100644
--- 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
 }