From f1f7297478c7f064840d6c96a06570abdf2a708f Mon Sep 17 00:00:00 2001
From: Tejal Desai <tejaldesai@google.com>
Date: Thu, 16 Jan 2020 16:50:41 -0800
Subject: [PATCH] fix tests

---
 pkg/snapshot/snapshot.go |  4 ++--
 pkg/util/fs_util.go      | 13 ++++++-------
 pkg/util/fs_util_test.go |  3 +++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkg/snapshot/snapshot.go b/pkg/snapshot/snapshot.go
index 8029f9ae2..fe2eead8f 100644
--- a/pkg/snapshot/snapshot.go
+++ b/pkg/snapshot/snapshot.go
@@ -182,7 +182,7 @@ func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) {
 			if err != nil {
 				return nil, nil, err
 			}
-			logrus.Debug("Adding files %s to layer, because it was changed.", files)
+			logrus.Debugf("Adding files %s to layer, because it was changed.", files)
 			filesToAdd = append(filesToAdd, files...)
 		}
 	}
@@ -241,7 +241,7 @@ func filesWithParentDirs(files []string) []string {
 
 func filesWithLinks(path string) ([]string, error) {
 	link, err := util.CanonicalizeLink(path)
-	if err == util.NotSymLink {
+	if err == util.ErrNotSymLink {
 		return []string{path}, nil
 	} else if err != nil {
 		return nil, err
diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go
index 45bf61150..b2c8e2ca0 100644
--- a/pkg/util/fs_util.go
+++ b/pkg/util/fs_util.go
@@ -691,7 +691,7 @@ func IsSymlink(fi os.FileInfo) bool {
 	return fi.Mode()&os.ModeSymlink != 0
 }
 
-var NotSymLink = fmt.Errorf("not a symlink")
+var ErrNotSymLink = fmt.Errorf("not a symlink")
 
 func CanonicalizeLink(path string) (string, error) {
 	fi, err := os.Lstat(path)
@@ -699,7 +699,7 @@ func CanonicalizeLink(path string) (string, error) {
 		return "", err
 	}
 	if !IsSymlink(fi) {
-		return "", NotSymLink
+		return "", ErrNotSymLink
 	}
 	return filepath.EvalSymlinks(path)
 }
@@ -709,14 +709,13 @@ func CanonicalizeLink(path string) (string, error) {
 func CopyFileOrSymlink(src string, destDir string) error {
 	destFile := filepath.Join(destDir, src)
 	if fi, _ := os.Lstat(src); IsSymlink(fi) {
-		if link, err := os.Readlink(src); err != nil {
+		link, err := os.Readlink(src)
+		if err != nil {
 			return err
-		} else {
-			return os.Symlink(link, destFile)
 		}
-	} else {
-		return otiai10Cpy.Copy(src, destFile)
+		return os.Symlink(link, destFile)
 	}
+	return otiai10Cpy.Copy(src, destFile)
 }
 
 func createParentDirectory(path string) error {
diff --git a/pkg/util/fs_util_test.go b/pkg/util/fs_util_test.go
index e6b97063a..6dfec9580 100644
--- a/pkg/util/fs_util_test.go
+++ b/pkg/util/fs_util_test.go
@@ -801,6 +801,9 @@ func TestCopySymlink(t *testing.T) {
 			tc := tc
 			t.Parallel()
 			r, err := ioutil.TempDir("", "")
+			os.MkdirAll(filepath.Join(r, filepath.Dir(tc.linkTarget)), 0777)
+			tc.linkTarget = filepath.Join(r, tc.linkTarget)
+			ioutil.WriteFile(tc.linkTarget, nil, 0644)
 			if err != nil {
 				t.Fatal(err)
 			}