Add sync before unmount on snapshotter layer test

dmcgowan · dcantah · commit 8d732c6c22d6 · 2023-08-18T03:10:54.000-07:00
Signed-off-by: Derek McGowan <derek@mcg.dev> (cherry picked from commit 1be571b) Signed-off-by: Danny Canter <danny@dcantah.dev>
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
@@ -962,6 +962,7 @@ func check128LayersMount(name string) func(ctx context.Context, t *testing.T, sn
 				t.Fatalf("[layer %d] preparing doesn't equal to flat after apply: %+v", i, err)
 			}
 
+			sync()
 			testutil.Unmount(t, preparing)
 
 			parent = filepath.Join(work, fmt.Sprintf("committed-%d", i))
diff --git a/snapshots/testsuite/testsuite_unix.go b/snapshots/testsuite/testsuite_unix.go
@@ -18,11 +18,19 @@
 
 package testsuite
 
-import "syscall"
+import (
+	"syscall"
+
+	"golang.org/x/sys/unix"
+)
 
 func clearMask() func() {
 	oldumask := syscall.Umask(0)
 	return func() {
 		syscall.Umask(oldumask)
 	}
 }
+
+func sync() {
+	unix.Sync()
+}
diff --git a/snapshots/testsuite/testsuite_windows.go b/snapshots/testsuite/testsuite_windows.go
@@ -19,3 +19,5 @@ package testsuite
 func clearMask() func() {
 	return func() {}
 }
+
+func sync() {}

Original file line number	Diff line number	Diff line change
`@@ -962,6 +962,7 @@ func check128LayersMount(name string) func(ctx context.Context, t *testing.T, sn`
`962`	`962`	`t.Fatalf("[layer %d] preparing doesn't equal to flat after apply: %+v", i, err)`
`963`	`963`	`}`
`964`	`964`
	`965`	`+ sync()`
`965`	`966`	`testutil.Unmount(t, preparing)`
`966`	`967`
`967`	`968`	`parent = filepath.Join(work, fmt.Sprintf("committed-%d", i))`