Merge pull request #142 from dmcgowan/fix-fstests

Fix fstest missing file updates

Author: crosbymichael

fs/fstest/compare.go

@@ -49,15 +49,7 @@ func CheckDirectoryEqual(d1, d2 string) error {
 
 diff:=diffResourceList(m1.Resources, m2.Resources)
 ifdiff.HasDiff() {
-iflen(diff.Deletions) !=0 {
-returnerrors.Errorf("directory diff between %s and %s\n%s", d1, d2, diff.String())
- }
-// TODO: Also skip Recycle Bin contents in Windows layers which is used to store deleted files in some cases
-for_, add:=rangediff.Additions {
-ifok, _:=metadataFiles[add.Path()]; !ok {
-returnerrors.Errorf("directory diff between %s and %s\n%s", d1, d2, diff.String())
- }
- }
+returnerrors.Errorf("directory diff between %s and %s\n%s", d1, d2, diff.String())
 	}
 
 returnnil

fs/fstest/compare_windows.go

@@ -17,6 +17,7 @@
 package fstest
 
 // TODO: Any more metadata files generated by Windows layers?
+// TODO: Also skip Recycle Bin contents in Windows layers which is used to store deleted files in some cases
 varmetadataFiles=map[string]bool{
 "\\System Volume Information": true,
 "\\WcSandboxState": true,

fs/fstest/continuity_util.go

@@ -42,7 +42,17 @@ type resourceListDifference struct {
 }
 
 func (lresourceListDifference) HasDiff() bool {
-returnlen(l.Additions) >0||len(l.Deletions) >0||len(l.Updates) >0
+iflen(l.Deletions) >0||len(l.Updates) >0|| (len(metadataFiles) ==0&&len(l.Additions) >0) {
+returntrue
+	}
+
+for_, add:=rangel.Additions {
+ifok, _:=metadataFiles[add.Path()]; !ok {
+returntrue
+ }
+	}
+
+returnfalse
 }
 
 func (lresourceListDifference) String() string {