From ea0fd0e8e5ba5cccdf5bf0e475a165c4996bd9aa Mon Sep 17 00:00:00 2001 From: Abin Shahab Date: Mon, 2 Feb 2015 00:42:35 +0000 Subject: [PATCH] Added /dev paths to layer comparison Lxc images have /dev (devices). This creates a list with the /dev paths in the test. Signed-off-by: Abin Shahab (github: ashahab-altiscale) --- integration-cli/docker_cli_save_load_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index 3130c1a264..a5056e0f44 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -400,6 +400,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") @@ -410,11 +411,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 }