containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3943 from gabibeyer/fix_tests 

Fix unit tests missing comparative for 'Expect'
This commit is contained in:
OpenShift Merge Robot 2019-09-05 12:49:21 +02:00 committed by GitHub
parent e74fcd7335 95f5411e88
commit b962b1e353
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/images_test.go
View File

@ -155,13 +155,13 @@ var _ = Describe("Podman images", func() {
retapline.WaitWithDefaultTimeout() retapline.WaitWithDefaultTimeout()
Expect(retapline.ExitCode()).To(Equal(0)) Expect(retapline.ExitCode()).To(Equal(0))
Expect(len(retapline.OutputToStringArray())).To(Equal(2)) Expect(len(retapline.OutputToStringArray())).To(Equal(2))
Expect(retapline.LineInOutputContains("alpine")) Expect(retapline.LineInOutputContains("alpine")).To(BeTrue())
retapline = podmanTest.PodmanNoCache([]string{"images", "-f", "reference=alpine"}) retapline = podmanTest.PodmanNoCache([]string{"images", "-f", "reference=alpine"})
retapline.WaitWithDefaultTimeout() retapline.WaitWithDefaultTimeout()
Expect(retapline.ExitCode()).To(Equal(0)) Expect(retapline.ExitCode()).To(Equal(0))
Expect(len(retapline.OutputToStringArray())).To(Equal(2)) Expect(len(retapline.OutputToStringArray())).To(Equal(2))
Expect(retapline.LineInOutputContains("alpine")) Expect(retapline.LineInOutputContains("alpine")).To(BeTrue())
retnone := podmanTest.PodmanNoCache([]string{"images", "-q", "-f", "reference=bogus"}) retnone := podmanTest.PodmanNoCache([]string{"images", "-q", "-f", "reference=bogus"})
retnone.WaitWithDefaultTimeout() retnone.WaitWithDefaultTimeout()

2
test/e2e/mount_test.go
View File

@ -77,7 +77,7 @@ var _ = Describe("Podman mount", func() {
j := podmanTest.Podman([]string{"mount", "--format=json"}) j := podmanTest.Podman([]string{"mount", "--format=json"})
j.WaitWithDefaultTimeout() j.WaitWithDefaultTimeout()
Expect(j.ExitCode()).To(Equal(0)) Expect(j.ExitCode()).To(Equal(0))
Expect(j.IsJSONOutputValid()) Expect(j.IsJSONOutputValid()).To(BeTrue())
umount := podmanTest.Podman([]string{"umount", cid}) umount := podmanTest.Podman([]string{"umount", cid})
umount.WaitWithDefaultTimeout() umount.WaitWithDefaultTimeout()

4
test/e2e/port_test.go
View File

@ -135,12 +135,12 @@ var _ = Describe("Podman port", func() {
result1 := podmanTest.Podman([]string{"port", "-l", "5000"}) result1 := podmanTest.Podman([]string{"port", "-l", "5000"})
result1.WaitWithDefaultTimeout() result1.WaitWithDefaultTimeout()
Expect(result1.ExitCode()).To(BeZero()) Expect(result1.ExitCode()).To(BeZero())
Expect(result1.LineInOuputStartsWith("0.0.0.0:5000")) Expect(result1.LineInOuputStartsWith("0.0.0.0:5000")).To(BeTrue())
// Check that the second port was honored // Check that the second port was honored
result2 := podmanTest.Podman([]string{"port", "-l", "5001"}) result2 := podmanTest.Podman([]string{"port", "-l", "5001"})
result2.WaitWithDefaultTimeout() result2.WaitWithDefaultTimeout()
Expect(result2.ExitCode()).To(BeZero()) Expect(result2.ExitCode()).To(BeZero())
Expect(result2.LineInOuputStartsWith("0.0.0.0:5001")) Expect(result2.LineInOuputStartsWith("0.0.0.0:5001")).To(BeTrue())
}) })
}) })

3
test/e2e/rmi_test.go
View File

@ -282,6 +282,7 @@ RUN find $LOCAL
session := podmanTest.PodmanNoCache([]string{"image", "rm"}) session := podmanTest.PodmanNoCache([]string{"image", "rm"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(125)) Expect(session.ExitCode()).To(Equal(125))
Expect(session.LineInOutputContains("image name or ID must be specified")) match, _ := session.ErrorGrepString("image name or ID must be specified")
Expect(match).To(BeTrue())
}) })
}) })

4
test/e2e/run_cpu_test.go
View File

@ -60,7 +60,7 @@ var _ = Describe("Podman run cpu", func() {
} }
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0)) Expect(result.ExitCode()).To(Equal(0))
Expect(result.LineInOutputContains("5000")) Expect(result.LineInOutputContains("5000")).To(BeTrue())
}) })
It("podman run cpu-quota", func() { It("podman run cpu-quota", func() {
@ -78,7 +78,7 @@ var _ = Describe("Podman run cpu", func() {
} }
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0)) Expect(result.ExitCode()).To(Equal(0))
Expect(result.LineInOutputContains("5000")) Expect(result.LineInOutputContains("5000")).To(BeTrue())
}) })
It("podman run cpus", func() { It("podman run cpus", func() {