Ensure mounts are unmounted before leaving the test

TBBle · gabriel-samfira · commit b0968b8bb920 · 2023-05-31T02:05:44.000+03:00
This is necessary on Windows, as it's not possible to delete a snapshot
while it is still mounted, even if the mount-point has been deleted.

Signed-off-by: Paul "TBBle" Hampson &lt;Paul.Hampson@Pobox.com&gt;
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
@@ -162,6 +162,7 @@ func checkSnapshotterBasic(ctx context.Context, t *testing.T, snapshotter snapsh
 	}
 
 	if err := initialApplier.Apply(preparing); err != nil {
+		testutil.Unmount(t, preparing)
 		t.Fatalf("failure reason: %+v", err)
 	}
 	// unmount before commit
@@ -199,10 +200,12 @@ func checkSnapshotterBasic(ctx context.Context, t *testing.T, snapshotter snapsh
 	}
 
 	if err := fstest.CheckDirectoryEqualWithApplier(next, initialApplier); err != nil {
+		testutil.Unmount(t, next)
 		t.Fatalf("failure reason: %+v", err)
 	}
 
 	if err := diffApplier.Apply(next); err != nil {
+		testutil.Unmount(t, next)
 		t.Fatalf("failure reason: %+v", err)
 	}
 	// unmount before commit
@@ -386,11 +389,12 @@ func checkSnapshotterTransitivity(ctx context.Context, t *testing.T, snapshotter
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer testutil.Unmount(t, preparing)
 
 	if err = os.WriteFile(filepath.Join(preparing, "foo"), []byte("foo\n"), 0777); err != nil {
+		testutil.Unmount(t, preparing)
 		t.Fatal(err)
 	}
+	testutil.Unmount(t, preparing)
 
 	snapA := filepath.Join(work, "snapA")
 	if err = snapshotter.Commit(ctx, snapA, preparing, opt); err != nil {
@@ -401,11 +405,12 @@ func checkSnapshotterTransitivity(ctx context.Context, t *testing.T, snapshotter
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer testutil.Unmount(t, next)
 
 	if err = os.WriteFile(filepath.Join(next, "foo"), []byte("foo bar\n"), 0777); err != nil {
+		testutil.Unmount(t, next)
 		t.Fatal(err)
 	}
+	testutil.Unmount(t, next)
 
 	snapB := filepath.Join(work, "snapB")
 	if err = snapshotter.Commit(ctx, snapB, next, opt); err != nil {
@@ -440,7 +445,7 @@ func checkSnapshotterPrepareView(ctx context.Context, t *testing.T, snapshotter
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer testutil.Unmount(t, preparing)
+	testutil.Unmount(t, preparing)
 
 	snapA := filepath.Join(work, "snapA")
 	if err = snapshotter.Commit(ctx, snapA, preparing, opt); err != nil {
@@ -517,6 +522,7 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot
 	if err != nil {
 		t.Fatal(err)
 	}
+	testutil.Unmount(t, base)
 
 	committedBase := filepath.Join(work, "committed-base")
 	if err = snapshotter.Commit(ctx, committedBase, base, opt); err != nil {
@@ -555,7 +561,6 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot
 	if err != nil {
 		t.Fatal(err)
 	}
-	testutil.Unmount(t, base)
 	err = snapshotter.Remove(ctx, committedBase)
 	if err != nil {
 		t.Fatal(err)
@@ -817,6 +822,7 @@ func checkSnapshotterViewReadonly(ctx context.Context, t *testing.T, snapshotter
 	if err := os.WriteFile(testfile, []byte("testcontent"), 0777); err != nil {
 		t.Logf("write to %q failed with %v (EROFS is expected but can be other error code)", testfile, err)
 	} else {
+		testutil.Unmount(t, viewMountPoint)
 		t.Fatalf("write to %q should fail (EROFS) but did not fail", testfile)
 	}
 	testutil.Unmount(t, viewMountPoint)

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@ func checkSnapshotterBasic(ctx context.Context, t *testing.T, snapshotter snapsh`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`if err := initialApplier.Apply(preparing); err != nil {`
	`165`	`+ testutil.Unmount(t, preparing)`
`165`	`166`	`t.Fatalf("failure reason: %+v", err)`
`166`	`167`	`}`
`167`	`168`	`// unmount before commit`
`@@ -199,10 +200,12 @@ func checkSnapshotterBasic(ctx context.Context, t *testing.T, snapshotter snapsh`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	`if err := fstest.CheckDirectoryEqualWithApplier(next, initialApplier); err != nil {`
	`203`	`+ testutil.Unmount(t, next)`
`202`	`204`	`t.Fatalf("failure reason: %+v", err)`
`203`	`205`	`}`
`204`	`206`
`205`	`207`	`if err := diffApplier.Apply(next); err != nil {`
	`208`	`+ testutil.Unmount(t, next)`
`206`	`209`	`t.Fatalf("failure reason: %+v", err)`
`207`	`210`	`}`
`208`	`211`	`// unmount before commit`
`@@ -386,11 +389,12 @@ func checkSnapshotterTransitivity(ctx context.Context, t *testing.T, snapshotter`
`386`	`389`	`if err != nil {`
`387`	`390`	`t.Fatal(err)`
`388`	`391`	`}`
`389`		`- defer testutil.Unmount(t, preparing)`
`390`	`392`
`391`	`393`	`if err = os.WriteFile(filepath.Join(preparing, "foo"), []byte("foo\n"), 0777); err != nil {`
	`394`	`+ testutil.Unmount(t, preparing)`
`392`	`395`	`t.Fatal(err)`
`393`	`396`	`}`
	`397`	`+ testutil.Unmount(t, preparing)`
`394`	`398`
`395`	`399`	`snapA := filepath.Join(work, "snapA")`
`396`	`400`	`if err = snapshotter.Commit(ctx, snapA, preparing, opt); err != nil {`
`@@ -401,11 +405,12 @@ func checkSnapshotterTransitivity(ctx context.Context, t *testing.T, snapshotter`
`401`	`405`	`if err != nil {`
`402`	`406`	`t.Fatal(err)`
`403`	`407`	`}`
`404`		`- defer testutil.Unmount(t, next)`
`405`	`408`
`406`	`409`	`if err = os.WriteFile(filepath.Join(next, "foo"), []byte("foo bar\n"), 0777); err != nil {`
	`410`	`+ testutil.Unmount(t, next)`
`407`	`411`	`t.Fatal(err)`
`408`	`412`	`}`
	`413`	`+ testutil.Unmount(t, next)`
`409`	`414`
`410`	`415`	`snapB := filepath.Join(work, "snapB")`
`411`	`416`	`if err = snapshotter.Commit(ctx, snapB, next, opt); err != nil {`
`@@ -440,7 +445,7 @@ func checkSnapshotterPrepareView(ctx context.Context, t *testing.T, snapshotter`
`440`	`445`	`if err != nil {`
`441`	`446`	`t.Fatal(err)`
`442`	`447`	`}`
`443`		`- defer testutil.Unmount(t, preparing)`
	`448`	`+ testutil.Unmount(t, preparing)`
`444`	`449`
`445`	`450`	`snapA := filepath.Join(work, "snapA")`
`446`	`451`	`if err = snapshotter.Commit(ctx, snapA, preparing, opt); err != nil {`
`@@ -517,6 +522,7 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot`
`517`	`522`	`if err != nil {`
`518`	`523`	`t.Fatal(err)`
`519`	`524`	`}`
	`525`	`+ testutil.Unmount(t, base)`
`520`	`526`
`521`	`527`	`committedBase := filepath.Join(work, "committed-base")`
`522`	`528`	`if err = snapshotter.Commit(ctx, committedBase, base, opt); err != nil {`
`@@ -555,7 +561,6 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot`
`555`	`561`	`if err != nil {`
`556`	`562`	`t.Fatal(err)`
`557`	`563`	`}`
`558`		`- testutil.Unmount(t, base)`
`559`	`564`	`err = snapshotter.Remove(ctx, committedBase)`
`560`	`565`	`if err != nil {`
`561`	`566`	`t.Fatal(err)`
`@@ -817,6 +822,7 @@ func checkSnapshotterViewReadonly(ctx context.Context, t *testing.T, snapshotter`
`817`	`822`	`if err := os.WriteFile(testfile, []byte("testcontent"), 0777); err != nil {`
`818`	`823`	`t.Logf("write to %q failed with %v (EROFS is expected but can be other error code)", testfile, err)`
`819`	`824`	`} else {`
	`825`	`+ testutil.Unmount(t, viewMountPoint)`
`820`	`826`	`t.Fatalf("write to %q should fail (EROFS) but did not fail", testfile)`
`821`	`827`	`}`
`822`	`828`	`testutil.Unmount(t, viewMountPoint)`