From 2c63b8439bbdc09203ea394ad2cf9352830861f0 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 10 Sep 2022 07:40:39 -0400 Subject: Fix stutters Podman adds an Error: to every error message. So starting an error message with "error" ends up being reported to the user as Error: error ... This patch removes the stutter. Also ioutil.ReadFile errors report the Path, so wrapping the err message with the path causes a stutter. Signed-off-by: Daniel J Walsh --- test/testvol/main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/testvol') diff --git a/test/testvol/main.go b/test/testvol/main.go index dd4ba642d..ab26e2df0 100644 --- a/test/testvol/main.go +++ b/test/testvol/main.go @@ -80,7 +80,7 @@ func startServer(socketPath string) error { if config.path == "" { path, err := ioutil.TempDir("", "test_volume_plugin") if err != nil { - return fmt.Errorf("error getting directory for plugin: %w", err) + return fmt.Errorf("getting directory for plugin: %w", err) } config.path = path } else { @@ -98,7 +98,7 @@ func startServer(socketPath string) error { server := volume.NewHandler(handle) if err := server.ServeUnix(socketPath, 0); err != nil { - return fmt.Errorf("error starting server: %w", err) + return fmt.Errorf("starting server: %w", err) } return nil } @@ -161,7 +161,7 @@ func (d *DirDriver) Create(opts *volume.CreateRequest) error { volPath := filepath.Join(d.volumesPath, opts.Name) if err := os.Mkdir(volPath, 0755); err != nil { - return fmt.Errorf("error making volume directory: %w", err) + return fmt.Errorf("making volume directory: %w", err) } newVol.path = volPath @@ -240,7 +240,7 @@ func (d *DirDriver) Remove(req *volume.RemoveRequest) error { delete(d.volumes, req.Name) if err := os.RemoveAll(vol.path); err != nil { - return fmt.Errorf("error removing mountpoint of volume %s: %w", req.Name, err) + return fmt.Errorf("removing mountpoint of volume %s: %w", req.Name, err) } logrus.Debugf("Removed volume %s", req.Name) -- cgit v1.2.3-54-g00ecf