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

Merge pull request #8131 from unclejack/fix_perm_detection

Browse source 
integcli: fix permission detection for aufs
This commit is contained in:
Michael Crosby 2014-09-19 11:55:56 -07:00
commit 63c8b8bf30
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/docker_cli_save_load_test.go
View file

@ -198,6 +198,7 @@ func TestSaveMultipleNames(t *testing.T) {
// Issue #6722 #5892 ensure directories are included in changes
func TestSaveDirectoryPermissions(t *testing.T) {
layerEntries := []string{"opt/", "opt/a/", "opt/a/b/", "opt/a/b/c"}
layerEntriesAUFS := []string{"./", ".wh..wh.aufs", ".wh..wh.orph/", ".wh..wh.plnk/", "opt/", "opt/a/", "opt/a/b/", "opt/a/b/c"}
name := "save-directory-permissions"
tmpDir, err := ioutil.TempDir("", "save-layers-with-directories")
@ -245,8 +246,9 @@ func TestSaveDirectoryPermissions(t *testing.T) {
t.Fatalf("encountered error while listing tar entries: %s", err)
}
if reflect.DeepEqual(entries, layerEntries) {
if reflect.DeepEqual(entries, layerEntries) || reflect.DeepEqual(entries, layerEntriesAUFS) {
found = true
break
}
}
}