opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 05:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19029 from rhatdan/inspect

Browse Source 
Remove 'inspecting object' from inspect errors
This commit is contained in:
OpenShift Merge Robot
2023-06-28 17:00:10 +02:00
committed by GitHub
parent 416b4eeac6 b6e636cbe2
commit 92b2a15a27
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/inspect/inspect.go
View File

@ -185,16 +185,16 @@ func (i *inspector) inspect(namesOrIDs []string) error {
err = rpt.Execute(data) err = rpt.Execute(data)
} }
if err != nil { if err != nil {
errs = append(errs, fmt.Errorf("printing inspect output: %w", err)) errs = append(errs, err)
} }
if len(errs) > 0 { if len(errs) > 0 {
if len(errs) > 1 { if len(errs) > 1 {
for _, err := range errs[1:] { for _, err := range errs[1:] {
fmt.Fprintf(os.Stderr, "error inspecting object: %v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
} }
} }
return fmt.Errorf("inspecting object: %w", errs[0]) return errs[0]
} }
return nil return nil
} }

6
test/system/700-play.bats
View File

@ -266,7 +266,7 @@ EOF
run_podman kube down $PODMAN_TMPDIR/test.yaml run_podman kube down $PODMAN_TMPDIR/test.yaml
run_podman 125 inspect test_pod-test run_podman 125 inspect test_pod-test
is "$output" ".*Error: inspecting object: no such object: \"test_pod-test\"" is "$output" ".*Error: no such object: \"test_pod-test\""
run_podman pod rm -a run_podman pod rm -a
run_podman rm -a run_podman rm -a
} }
@ -454,7 +454,7 @@ _EOF
run_podman kube down $PODMAN_TMPDIR/test.yaml run_podman kube down $PODMAN_TMPDIR/test.yaml
run_podman 125 inspect test_pod-test run_podman 125 inspect test_pod-test
is "$output" ".*Error: inspecting object: no such object: \"test_pod-test\"" is "$output" ".*Error: no such object: \"test_pod-test\""
run_podman pod rm -a run_podman pod rm -a
run_podman rm -a run_podman rm -a
} }
@ -477,7 +477,7 @@ _EOF
is "$output" "true" is "$output" "true"
run_podman kube down $SERVER/testpod.yaml run_podman kube down $SERVER/testpod.yaml
run_podman 125 inspect test_pod-test run_podman 125 inspect test_pod-test
is "$output" ".*Error: inspecting object: no such object: \"test_pod-test\"" is "$output" ".*Error: no such object: \"test_pod-test\""
run_podman pod rm -a -f run_podman pod rm -a -f
run_podman rm -a -f -t0 run_podman rm -a -f -t0