0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10510 from ashahab-altiscale/9875-lxc-image-layer

Browse source 
Added /dev paths to layer comparison
This commit is contained in:
Michael Crosby 2015-02-25 14:52:31 -08:00
commit 481e75203d
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration-cli/docker_cli_save_load_test.go
View file

@ -389,6 +389,7 @@ func TestSaveDirectoryPermissions(t *testing.T) {
}
found := false
var entriesSansDev []string
for _, entry := range dirs {
if entry.IsDir() {
layerPath := filepath.Join(extractionDirectory, entry.Name(), "layer.tar")
@ -399,11 +400,16 @@ func TestSaveDirectoryPermissions(t *testing.T) {
}
entries, err := ListTar(f)
for _, e := range entries {
if !strings.Contains(e, "dev/") {
entriesSansDev = append(entriesSansDev, e)
}
}
if err != nil {
t.Fatalf("encountered error while listing tar entries: %s", err)
}
if reflect.DeepEqual(entries, layerEntries) || reflect.DeepEqual(entries, layerEntriesAUFS) {
if reflect.DeepEqual(entriesSansDev, layerEntries) || reflect.DeepEqual(entriesSansDev, layerEntriesAUFS) {
found = true
break
}