summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-29 19:54:49 +0200
committerGitHub <noreply@github.com>2019-07-29 19:54:49 +0200
commitc3c45f3ba5c2782be9658a33f8632467a06c6422 (patch)
treeb6e047a9f9c1998cca19e79dafe3f1d08d18378a /test
parent6665269ab8bd413799df6568a83a3ac679c93ad1 (diff)
parent6065070baed175853301a6396697f2fd6fbc511e (diff)
downloadpodman-c3c45f3ba5c2782be9658a33f8632467a06c6422.tar.gz
podman-c3c45f3ba5c2782be9658a33f8632467a06c6422.tar.bz2
podman-c3c45f3ba5c2782be9658a33f8632467a06c6422.zip
Merge pull request #3646 from vrothberg/hi-scott
fix `podman -v` regression
Diffstat (limited to 'test')
-rw-r--r--test/e2e/version_test.go21
1 files changed, 21 insertions, 0 deletions
diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go
index 2c8b3068c..0db2e2cf2 100644
--- a/test/e2e/version_test.go
+++ b/test/e2e/version_test.go
@@ -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() {