Browse code

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 <ashahab@altiscale.com> (github: ashahab-altiscale)

Abin Shahab authored on 2015/02/02 09:42:35
Showing 1 changed files
... ...
@@ -400,6 +400,7 @@ func TestSaveDirectoryPermissions(t *testing.T) {
400 400
 	}
401 401
 
402 402
 	found := false
403
+	var entriesSansDev []string
403 404
 	for _, entry := range dirs {
404 405
 		if entry.IsDir() {
405 406
 			layerPath := filepath.Join(extractionDirectory, entry.Name(), "layer.tar")
... ...
@@ -410,11 +411,16 @@ func TestSaveDirectoryPermissions(t *testing.T) {
410 410
 			}
411 411
 
412 412
 			entries, err := ListTar(f)
413
+			for _, e := range entries {
414
+				if !strings.Contains(e, "dev/") {
415
+					entriesSansDev = append(entriesSansDev, e)
416
+				}
417
+			}
413 418
 			if err != nil {
414 419
 				t.Fatalf("encountered error while listing tar entries: %s", err)
415 420
 			}
416 421
 
417
-			if reflect.DeepEqual(entries, layerEntries) || reflect.DeepEqual(entries, layerEntriesAUFS) {
422
+			if reflect.DeepEqual(entriesSansDev, layerEntries) || reflect.DeepEqual(entriesSansDev, layerEntriesAUFS) {
418 423
 				found = true
419 424
 				break
420 425
 			}