Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions fs/fstest/compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,7 @@ func CheckDirectoryEqual(d1, d2 string) error {

diff := diffResourceList(m1.Resources, m2.Resources)
if diff.HasDiff() {
if len(diff.Deletions) != 0 {
return errors.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 := range diff.Additions {
if ok, _ := metadataFiles[add.Path()]; !ok {
return errors.Errorf("directory diff between %s and %s\n%s", d1, d2, diff.String())
}
}
return errors.Errorf("directory diff between %s and %s\n%s", d1, d2, diff.String())
}

return nil
Expand Down
1 change: 1 addition & 0 deletions fs/fstest/compare_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
var metadataFiles = map[string]bool{
"\\System Volume Information": true,
"\\WcSandboxState": true,
Expand Down
12 changes: 11 additions & 1 deletion fs/fstest/continuity_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,17 @@ type resourceListDifference struct {
}

func (l resourceListDifference) HasDiff() bool {
return len(l.Additions) > 0 || len(l.Deletions) > 0 || len(l.Updates) > 0
if len(l.Deletions) > 0 || len(l.Updates) > 0 || (len(metadataFiles) == 0 && len(l.Additions) > 0) {
return true
}

for _, add := range l.Additions {
if ok, _ := metadataFiles[add.Path()]; !ok {
return true
}
}

return false
}

func (l resourceListDifference) String() string {
Expand Down