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 <dwalsh@redhat.com>

5 files changed, 8 insertions, 8 deletions

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index a3bfe5780..b1ce91d14 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -423,7 +423,7 @@ json-file | f
 
     # Invalid log-driver argument
     run_podman 125 run --log-driver=InvalidDriver $IMAGE true
-    is "$output" "Error: error running container create option: invalid log driver: invalid argument" \
+    is "$output" "Error: running container create option: invalid log driver: invalid argument" \
        "--log-driver InvalidDriver"
 }
 
diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats
index e3a9ec4c3..9bbd56fef 100644
--- a/test/system/200-pod.bats
+++ b/test/system/200-pod.bats
@@ -435,7 +435,7 @@ EOF
     run_podman pod rm $podID
 
     run_podman 125 pod create --exit-policy invalid
-    is "$output" "Error: .*error running pod create option: invalid pod exit policy: \"invalid\"" "invalid exit policy"
+    is "$output" "Error: .*running pod create option: invalid pod exit policy: \"invalid\"" "invalid exit policy"
 
     # Test exit-policy behaviour
     run_podman pod create --exit-policy continue
diff --git a/test/system/330-corrupt-images.bats b/test/system/330-corrupt-images.bats
index 7f2b81835..2f0fd753c 100644
--- a/test/system/330-corrupt-images.bats
+++ b/test/system/330-corrupt-images.bats
@@ -74,7 +74,7 @@ function _corrupt_image_test() {
         # Corruptify, and confirm that 'podman images' throws an error
         rm -v ${PODMAN_CORRUPT_TEST_WORKDIR}/root/*-images/$id/${rm_path}
         run_podman 125 images
-        is "$output" "Error: error retrieving label for image \"$id\": you may need to remove the image to resolve the error.*"
+        is "$output" "Error: retrieving label for image \"$id\": you may need to remove the image to resolve the error.*"
 
         # Run the requested command. Confirm it succeeds, with suitable warnings
         run_podman $*
diff --git a/test/system/710-kube.bats b/test/system/710-kube.bats
index c446ff65f..97a640e3f 100644
--- a/test/system/710-kube.bats
+++ b/test/system/710-kube.bats
@@ -91,7 +91,7 @@ status                           | =  | null
     # Needs at least one container. Error is slightly different between
     # regular and remote podman:
     #   regular: Error: pod ... only has...
-    #   remote:  Error: error generating YAML: pod ... only has...
+    #   remote:  Error: generating YAML: pod ... only has...
     run_podman 125 kube generate $pname
     assert "$output" =~ "Error: .* only has an infra container"
 
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)