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

Merge pull request #3646 from vrothberg/hi-scott

Browse Source 
fix `podman -v` regression
This commit is contained in:
OpenShift Merge Robot
2019-07-29 19:54:49 +02:00
committed by GitHub
parent 6665269ab8 6065070bae
commit c3c45f3ba5
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/main.go
View File

@ -91,7 +91,7 @@ func init() {
rootCmd.Version = version.Version
// Override default --help information of `--version` global flag
var dummyVersion bool
rootCmd.PersistentFlags().BoolVar(&dummyVersion, "version", false, "Version for podman")
rootCmd.Flags().BoolVarP(&dummyVersion, "version", "v", false, "Version of podman")
rootCmd.AddCommand(mainCommands...)
rootCmd.AddCommand(getMainCommands()...)
}

21
test/e2e/version_test.go
View File

@ -4,6 +4,7 @@ import (
"os"
. "github.com/containers/libpod/test/utils"
"github.com/containers/libpod/version"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
@ -37,6 +38,26 @@ var _ = Describe("Podman version", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2))
ok, _ := session.GrepString(version.Version)
Expect(ok).To(BeTrue())
})
It("podman -v", func() {
SkipIfRemote()
session := podmanTest.Podman([]string{"-v"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
ok, _ := session.GrepString(version.Version)
Expect(ok).To(BeTrue())
})
It("podman --version", func() {
SkipIfRemote()
session := podmanTest.Podman([]string{"--version"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
ok, _ := session.GrepString(version.Version)
Expect(ok).To(BeTrue())
})
It("podman version --format json", func() {