kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

integcli: fix permission detection for aufs

Browse source 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
This commit is contained in:
unclejack 2014-09-19 21:08:57 +03:00
parent e91de29e08
commit 1a0347ff1d
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 // Issue #6722 #5892 ensure directories are included in changes
func TestSaveDirectoryPermissions(t *testing.T) { func TestSaveDirectoryPermissions(t *testing.T) {
layerEntries := []string{"opt/", "opt/a/", "opt/a/b/", "opt/a/b/c"} 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" name := "save-directory-permissions"
tmpDir, err := ioutil.TempDir("", "save-layers-with-directories") 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) 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 found = true
break
} }
} }
} }