Modifying directory equality check to account for tars

Author: cftorres

differs/fileDiff.go

@@ -52,6 +52,7 @@ func diffImageFiles(image1, image2 utils.Image) (utils.DirDiff, error) {
 		Image2: image2.Source,
 		Adds:   adds,
 		Dels:   dels,
+		Mods:	[]string{},
 	}
 
 	err = os.Remove(target1)

utils/fs_utils.go

@@ -98,6 +98,7 @@ type DirDiff struct {
 	Mods   []string
 }
 
+// DiffDirectory takes the diff of two directories, assuming both are completely unpacked
 func DiffDirectory(d1, d2 Directory) (DirDiff, bool) {
 	adds := GetAddedEntries(d1, d2)
 	dels := GetDeletedEntries(d1, d2)

utils/tar_utils.go

@@ -127,6 +127,7 @@ func CheckTar(image string) bool {
 		return false
 	}
 	if _, err := os.Stat(image); err != nil {
+		glog.Errorf("%s does not exist", image)
 		return false
 	}
 	return true

utils/tar_utils_test.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"fmt"
+	//"fmt"
 	"errors"
 	"io"
 	"io/ioutil"
@@ -74,10 +74,10 @@ func TestUnTar(t *testing.T) {
 			remove = false
 		}
 		if !dirEquals(test.expected, test.target) {
-			d1, _ := GetDirectory(test.expected, true)
-			fmt.Println(d1.Content)
-			d2, _ := GetDirectory(test.target, true)
-			fmt.Println(d2.Content)
+			//d1, _ := GetDirectory(test.expected, true)
+			//fmt.Println(d1.Content)
+			//d2, _ := GetDirectory(test.target, true)
+			//fmt.Println(d2.Content)
 			t.Error(test.descrip, ": Directory created not correct structure.")
 			remove = false
 		}