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

Added /dev paths to layer comparison
Upstream-commit: 481e75203d8c5db264a795c35d422d081a2f03b0
Component: engine

components/engine/integration-cli/docker_cli_save_load_test.go

@@ -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
 			}