internal/fs: nits here and there

Signed-off-by: Ibrahim AshShohail <[email protected]>

Author: ibrasho

internal/fs/fs.go

@@ -243,7 +243,7 @@ func CopyDir(src, dst string) error {
 // the copied data is synced/flushed to stable storage.
 func copyFile(src, dst string) (err error) {
 	if sym, err := IsSymlink(src); err != nil {
-		return errors.Wrapf(err, "could not lstat %s", src)
+		return err
 	} else if sym {
 		err := copySymlink(src, dst)
 		return err
@@ -296,11 +296,8 @@ func copySymlink(src, dst string) error {
 	}
 
 	err = os.Symlink(resolved, dst)
-	if err != nil {
-		return errors.Wrapf(err, "failed to create symlink %s to %s", src, resolved)
-	}
 
-	return nil
+	return errors.Wrapf(err, "failed to create symlink %s to %s", src, resolved)
 }
 
 // IsDir determines is the path given is a directory or not.

internal/fs/fs_test.go

@@ -772,6 +772,13 @@ func TestIsEmpty(t *testing.T) {
 }
 
 func TestIsSymlink(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		// XXX: creating symlinks is not supported in Go on
+		// Microsoft Windows. Skipping this this until a solution
+		// for creating symlinks is is provided.
+		t.Skip("skipping on windows")
+	}
+
 	dir, err := ioutil.TempDir("", "dep")
 	if err != nil {
 		t.Fatal(err)
@@ -834,22 +841,15 @@ func TestIsSymlink(t *testing.T) {
 	}
 
 	for path, want := range tests {
-		if runtime.GOOS == "windows" {
-			// XXX: setting permissions works differently in
-			// Microsoft Windows. Skipping this this until a
-			// compatible implementation is provided.
-			t.Skip("skipping on windows")
-		}
-
 		got, err := IsSymlink(path)
 		if err != nil {
 			if !want.err {
-				t.Fatalf("expected no error, got %v", err)
+				t.Errorf("expected no error, got %v", err)
 			}
 		}
 
 		if got != want.expected {
-			t.Fatalf("expected %t for %s, got %t", want.expected, path, got)
+			t.Errorf("expected %t for %s, got %t", want.expected, path, got)
 		}
 	}
 }