From 1a0347ff1dd1035066b5faf86db0587491b5d638 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 19 Sep 2014 21:08:57 +0300 Subject: [PATCH] integcli: fix permission detection for aufs Docker-DCO-1.1-Signed-off-by: Cristian Staretu (github: unclejack) --- integration-cli/docker_cli_save_load_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index 46fa2a58e0..8632247b7d 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -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 } } }