diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-02 17:57:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-02 17:57:44 +0100 |
| commit | 8d00c838fb3da8ab4e0f8fdd79dd8aac263c6b59 (patch) | |
| tree | 44df3e263101b55fe25940bbec465549596dfb1b /test/e2e/version_test.go | |
| parent | e4275b3453598c3cdcf1ee00ff73c55780aef444 (diff) | |
| parent | b9b2ab5e5fa3ee7286483ff11c3f08de91e84495 (diff) | |
| download | podman-8d00c838fb3da8ab4e0f8fdd79dd8aac263c6b59.tar.gz podman-8d00c838fb3da8ab4e0f8fdd79dd8aac263c6b59.tar.bz2 podman-8d00c838fb3da8ab4e0f8fdd79dd8aac263c6b59.zip | |
Merge pull request #4608 from rhatdan/vendor
Fix podman-remote version to print client and server
Diffstat (limited to 'test/e2e/version_test.go')
| -rw-r--r-- | test/e2e/version_test.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index 0db2e2cf2..c2af613aa 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -33,7 +33,6 @@ var _ = Describe("Podman version", func() { }) It("podman version", func() { - SkipIfRemote() session := podmanTest.Podman([]string{"version"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -43,7 +42,6 @@ var _ = Describe("Podman version", func() { }) It("podman -v", func() { - SkipIfRemote() session := podmanTest.Podman([]string{"-v"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -52,7 +50,6 @@ var _ = Describe("Podman version", func() { }) It("podman --version", func() { - SkipIfRemote() session := podmanTest.Podman([]string{"--version"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -61,7 +58,6 @@ var _ = Describe("Podman version", func() { }) It("podman version --format json", func() { - SkipIfRemote() session := podmanTest.Podman([]string{"version", "--format", "json"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -69,7 +65,6 @@ var _ = Describe("Podman version", func() { }) It("podman version --format json", func() { - SkipIfRemote() session := podmanTest.Podman([]string{"version", "--format", "{{ json .}}"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -77,8 +72,15 @@ var _ = Describe("Podman version", func() { }) It("podman version --format GO template", func() { - SkipIfRemote() - session := podmanTest.Podman([]string{"version", "--format", "{{ .Version }}"}) + session := podmanTest.Podman([]string{"version", "--format", "{{ .Client.Version }}"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + + session = podmanTest.Podman([]string{"version", "--format", "{{ .Server.Version }}"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + + session = podmanTest.Podman([]string{"version", "--format", "{{ .Version }}"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) }) |