msg and test update

Author: jeevatkm

filepath.go

@@ -154,7 +154,7 @@ func doWalk(fname string, linkName string, walkFn filepath.WalkFunc) error {
 // CopyFile copies the given source file into destination
 func CopyFile(dest, src string) (int64, error) {
 	if !IsFileExists(src) {
-		return 0, fmt.Errorf("source file is not exists: %v", src)
+		return 0, fmt.Errorf("source file does not exists: %v", src)
 	}
 
 	baseName := filepath.Base(src)
@@ -191,7 +191,7 @@ func CopyFile(dest, src string) (int64, error) {
 // and it excludes give file matches
 func CopyDir(dest, src string, excludes Excludes) error {
 	if !IsFileExists(src) {
-		return fmt.Errorf("source dir is not exists: %v", src)
+		return fmt.Errorf("source dir does not exists: %v", src)
 	}
 
 	src = filepath.Clean(src)

filepath_test.go

@@ -185,29 +185,29 @@ func TestCopyDir(t *testing.T) {
 
 	defer DeleteFiles(join(tmpDir, "test1"))
 
-	err := CopyDir(
+	err1 := CopyDir(
 		join(tmpDir, "target"),
 		join(testdataPath, "not-exists-dir"),
 		Excludes{},
 	)
-	assert.NotNil(t, err)
+	assert.NotNil(t, err1)
 
-	err = CopyDir(
+	err2 := CopyDir(
 		join(tmpDir, "target"),
 		join(testdataPath, "sample.txt"),
 		Excludes{},
 	)
-	assert.NotNil(t, err)
+	assert.NotNil(t, err2)
 
-	err = CopyDir(tmpDir, testdataPath, Excludes{})
-	assert.True(t, strings.HasPrefix(err.Error(), "destination dir already exists"))
+	err3 := CopyDir(tmpDir, testdataPath, Excludes{})
+	assert.True(t, strings.HasPrefix(err3.Error(), "destination dir already exists"))
 
-	err = CopyDir(join(tmpDir, "target"), testdataPath, Excludes{"[]a]"})
-	assert.NotNil(t, err)
+	err4 := CopyDir(join(tmpDir, "target"), testdataPath, Excludes{"[]a]"})
+	assert.NotNil(t, err4)
 
 	pwd, _ := os.Getwd()
-	err = CopyDir(join(tmpDir, "test1"), pwd, Excludes{"test*", "*conf", ".*"})
-	assert.FailNowOnError(t, err, "copy directory failed")
+	err5 := CopyDir(join(tmpDir, "test1"), pwd, Excludes{"test*", "*conf", ".*"})
+	assert.FailNowOnError(t, err5, "copy directory failed")
 }
 
 func TestStripExt(t *testing.T) {
@@ -228,6 +228,7 @@ func TestDirPaths(t *testing.T) {
 	path12 := join(testdataPath, "dirpaths", "level1", "level1-2")
 	path21 := join(testdataPath, "dirpaths", "level1", "level2", "level2-1")
 	path22 := join(testdataPath, "dirpaths", "level1", "level2", "level2-2")
+	defer DeleteFiles(join(testdataPath, "dirpaths"))
 
 	_ = MkDirAll(path1, 0755)
 	_ = MkDirAll(path11, 0755)