Fix layer comparison and enable read-only checks

gabriel-samfira · gabriel-samfira · commit 96fbe5bc8826 · 2023-05-31T02:06:28.000+03:00
fstest.CheckDirectoryEqual checks if any files in the diff matches a
list of known metadataFiles. This only happens if we specify the initial
layer as the first parameter and the mutated layer as the second.

This also enables the read-only view checks, as the bind filter allows
us to mount a layer as ro.

Signed-off-by: Gabriel Adrian Samfira &lt;gsamfira@cloudbasesolutions.com&gt;
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
@@ -796,10 +796,6 @@ func checkRemove(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh
 // checkSnapshotterViewReadonly ensures a KindView snapshot to be mounted as a read-only filesystem.
 // This function is called only when WithTestViewReadonly is true.
 func checkSnapshotterViewReadonly(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) {
-	if runtime.GOOS == "windows" {
-		t.Skip("Read-only protection on views is not supported on WCOW")
-	}
-
 	preparing := filepath.Join(work, "preparing")
 	if _, err := snapshotter.Prepare(ctx, preparing, "", opt); err != nil {
 		t.Fatal(err)
@@ -946,7 +942,7 @@ func check128LayersMount(name string) func(ctx context.Context, t *testing.T, sn
 
 			t.Log("mount", preparing)
 
-			if err := fstest.CheckDirectoryEqual(preparing, flat); err != nil {
+			if err := fstest.CheckDirectoryEqual(flat, preparing); err != nil {
 				testutil.Unmount(t, preparing)
 				t.Fatalf("[layer %d] preparing doesn't equal to flat before apply: %+v", i, err)
 			}
@@ -961,7 +957,7 @@ func check128LayersMount(name string) func(ctx context.Context, t *testing.T, sn
 				t.Fatalf("[layer %d] failed to apply on preparing dir: %+v", i, err)
 			}
 
-			if err := fstest.CheckDirectoryEqual(preparing, flat); err != nil {
+			if err := fstest.CheckDirectoryEqual(flat, preparing); err != nil {
 				testutil.Unmount(t, preparing)
 				t.Fatalf("[layer %d] preparing doesn't equal to flat after apply: %+v", i, err)
 			}
@@ -990,7 +986,7 @@ func check128LayersMount(name string) func(ctx context.Context, t *testing.T, sn
 		}
 		defer testutil.Unmount(t, view)
 
-		if err := fstest.CheckDirectoryEqual(view, flat); err != nil {
+		if err := fstest.CheckDirectoryEqual(flat, view); err != nil {
 			t.Fatalf("fullview should equal to flat: %+v", err)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -796,10 +796,6 @@ func checkRemove(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh`
`796`	`796`	`// checkSnapshotterViewReadonly ensures a KindView snapshot to be mounted as a read-only filesystem.`
`797`	`797`	`// This function is called only when WithTestViewReadonly is true.`
`798`	`798`	`func checkSnapshotterViewReadonly(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) {`
`799`		`- if runtime.GOOS == "windows" {`
`800`		`- t.Skip("Read-only protection on views is not supported on WCOW")`
`801`		`- }`
`802`		`-`
`803`	`799`	`preparing := filepath.Join(work, "preparing")`
`804`	`800`	`if _, err := snapshotter.Prepare(ctx, preparing, "", opt); err != nil {`
`805`	`801`	`t.Fatal(err)`
`@@ -946,7 +942,7 @@ func check128LayersMount(name string) func(ctx context.Context, t *testing.T, sn`
`946`	`942`
`947`	`943`	`t.Log("mount", preparing)`
`948`	`944`
`949`		`- if err := fstest.CheckDirectoryEqual(preparing, flat); err != nil {`
	`945`	`+ if err := fstest.CheckDirectoryEqual(flat, preparing); err != nil {`
`950`	`946`	`testutil.Unmount(t, preparing)`
`951`	`947`	`t.Fatalf("[layer %d] preparing doesn't equal to flat before apply: %+v", i, err)`
`952`	`948`	`}`
`@@ -961,7 +957,7 @@ func check128LayersMount(name string) func(ctx context.Context, t *testing.T, sn`
`961`	`957`	`t.Fatalf("[layer %d] failed to apply on preparing dir: %+v", i, err)`
`962`	`958`	`}`
`963`	`959`
`964`		`- if err := fstest.CheckDirectoryEqual(preparing, flat); err != nil {`
	`960`	`+ if err := fstest.CheckDirectoryEqual(flat, preparing); err != nil {`
`965`	`961`	`testutil.Unmount(t, preparing)`
`966`	`962`	`t.Fatalf("[layer %d] preparing doesn't equal to flat after apply: %+v", i, err)`
`967`	`963`	`}`
`@@ -990,7 +986,7 @@ func check128LayersMount(name string) func(ctx context.Context, t *testing.T, sn`
`990`	`986`	`}`
`991`	`987`	`defer testutil.Unmount(t, view)`
`992`	`988`
`993`		`- if err := fstest.CheckDirectoryEqual(view, flat); err != nil {`
	`989`	`+ if err := fstest.CheckDirectoryEqual(flat, view); err != nil {`
`994`	`990`	`t.Fatalf("fullview should equal to flat: %+v", err)`
`995`	`991`	`}`
`996`	`992`	`}`