diff options
| -rw-r--r-- | cmd/podman/image.go | 10 | ||||
| -rw-r--r-- | test/e2e/rmi_test.go | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/cmd/podman/image.go b/cmd/podman/image.go index b5c1c3ccf..0777425eb 100644 --- a/cmd/podman/image.go +++ b/cmd/podman/image.go @@ -1,6 +1,8 @@ package main import ( + "strings" + "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/spf13/cobra" ) @@ -39,11 +41,13 @@ func init() { imageCommand.AddCommand(getImageSubCommands()...) // Setup of "images" to appear as "list" - _imagesSubCommand.Use = "list" + _imagesSubCommand.Use = strings.Replace(_imagesSubCommand.Use, "images", "list", 1) _imagesSubCommand.Aliases = []string{"ls"} + _imagesSubCommand.Example = strings.Replace(_imagesSubCommand.Example, "podman images", "podman image list", -1) imageCommand.AddCommand(&_imagesSubCommand) - // Setup of "rmi" to appears as "rm" - _rmSubCommand.Use = "rm" + // It makes no sense to keep 'podman images rmi'; just use 'rm' + _rmSubCommand.Use = strings.Replace(_rmSubCommand.Use, "rmi", "rm", 1) + _rmSubCommand.Example = strings.Replace(_rmSubCommand.Example, "podman rmi", "podman image rm", -1) imageCommand.AddCommand(&_rmSubCommand) } diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index dcbda2df4..26cc925ef 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -275,4 +275,13 @@ RUN find $LOCAL Expect(images.ExitCode()).To(Equal(0)) Expect(len(images.OutputToStringArray())).To(Equal(0)) }) + + // Don't rerun all tests; just assume that if we get that diagnostic, + // we're getting rmi + It("podman image rm is the same as rmi", func() { + session := podmanTest.Podman([]string{"image", "rm"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(125)) + Expect(session.LineInOutputContains("image name or ID must be specified")) + }) }) |