Improve error messages and remove check

gabriel-samfira · gabriel-samfira · commit acff3eefa69b · 2023-05-31T02:12:32.000+03:00
* Improve error messages
  * remove a check for the existance of unmount target. We probably
    should not mask that the target was missing.

Signed-off-by: Gabriel Adrian Samfira &lt;gsamfira@cloudbasesolutions.com&gt;
diff --git a/mount/mount_windows.go b/mount/mount_windows.go
@@ -132,14 +132,6 @@ func (m *Mount) GetParentPaths() ([]string, error) {
 
 // Unmount the mount at the provided path
 func Unmount(mount string, flags int) error {
-	if _, err := os.Stat(mount); err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-
-		return fmt.Errorf("failed to access mount point %s: %w", mount, err)
-	}
-
 	mount = filepath.Clean(mount)
 	adsFile := mount + ":" + sourceStreamName
 	var layerPath string
diff --git a/snapshots/testsuite/issues.go b/snapshots/testsuite/issues.go
@@ -96,7 +96,7 @@ func checkRemoveDirectoryInLowerLayer(ctx context.Context, t *testing.T, sn snap
 // see https://github.com/docker/docker/issues/28391 overlay2
 func checkChown(ctx context.Context, t *testing.T, sn snapshots.Snapshotter, work string) {
 	if runtime.GOOS == "windows" {
-		t.Skip("Chown is not supported on WCOW")
+		t.Skip("Chown is not supported on Windows")
 	}
 	l1Init := fstest.Apply(
 		fstest.CreateDir("/opt", 0700),
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
@@ -877,7 +877,7 @@ func closeTwice(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsho
 
 func checkRootPermission(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) {
 	if runtime.GOOS == "windows" {
-		t.Skip("Filesystem permissions are not supported on WCOW")
+		t.Skip("Filesystem permissions are not supported on Windows")
 	}
 
 	preparing, err := snapshotterPrepareMount(ctx, snapshotter, "preparing", "", work)
diff --git a/snapshots/windows/windows.go b/snapshots/windows/windows.go
@@ -356,7 +356,7 @@ func (s *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
 		// Create the new snapshot dir
 		snDir := s.getSnapshotDir(newSnapshot.ID)
 		if err = os.MkdirAll(snDir, 0700); err != nil {
-			return fmt.Errorf("creating snapshot dir: %w", err)
+			return fmt.Errorf("failed to create snapshot dir %s: %w", snDir, err)
 		}
 
 		if strings.Contains(key, snapshots.UnpackKeyPrefix) {

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ func checkRemoveDirectoryInLowerLayer(ctx context.Context, t *testing.T, sn snap`
`96`	`96`	`// see https://github.com/docker/docker/issues/28391 overlay2`
`97`	`97`	`func checkChown(ctx context.Context, t *testing.T, sn snapshots.Snapshotter, work string) {`
`98`	`98`	`if runtime.GOOS == "windows" {`
`99`		`- t.Skip("Chown is not supported on WCOW")`
	`99`	`+ t.Skip("Chown is not supported on Windows")`
`100`	`100`	`}`
`101`	`101`	`l1Init := fstest.Apply(`
`102`	`102`	`fstest.CreateDir("/opt", 0700),`
Original file line number	Diff line number	Diff line change
`@@ -877,7 +877,7 @@ func closeTwice(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsho`
`877`	`877`
`878`	`878`	`func checkRootPermission(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) {`
`879`	`879`	`if runtime.GOOS == "windows" {`
`880`		`- t.Skip("Filesystem permissions are not supported on WCOW")`
	`880`	`+ t.Skip("Filesystem permissions are not supported on Windows")`
`881`	`881`	`}`
`882`	`882`
`883`	`883`	`preparing, err := snapshotterPrepareMount(ctx, snapshotter, "preparing", "", work)`
Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ func (s *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k`
`356`	`356`	`// Create the new snapshot dir`
`357`	`357`	`snDir := s.getSnapshotDir(newSnapshot.ID)`
`358`	`358`	`if err = os.MkdirAll(snDir, 0700); err != nil {`
`359`		`- return fmt.Errorf("creating snapshot dir: %w", err)`
	`359`	`+ return fmt.Errorf("failed to create snapshot dir %s: %w", snDir, err)`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`if strings.Contains(key, snapshots.UnpackKeyPrefix) {`