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

e2e tests: clean up antihelpful BeTrue()s

Browse Source 
Many ginkgo tests have been written to use this evil form:

    GrepString("foo")
    Expect(that to BeTrue())

...which yields horrible useless messages on failure:

    false is not true

Identify those (automatically, via script) and convert to:

    Expect(output to ContainSubstring("foo"))

...which yields:

    "this output" does not contain substring "foo"

There are still many BeTrue()s left. This is just a start.

This is commit 1 of 2. It includes the script I used, and
all changes to *.go are those computed by the script.
Commit 2 will apply some manual fixes.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2021-11-22 10:54:22 -07:00
parent 1bfbb28b03
commit 97ab9176f7
31 changed files with 200 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/e2e/run_env_test.go
View File

@ -37,39 +37,33 @@ var _ = Describe("Podman run", func() {
session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "HOME"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ := session.GrepString("/root")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("/root"))
session = podmanTest.Podman([]string{"run", "--rm", "--user", "2", ALPINE, "printenv", "HOME"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ = session.GrepString("/sbin")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("/sbin"))
session = podmanTest.Podman([]string{"run", "--rm", "--env", "HOME=/foo", ALPINE, "printenv", "HOME"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ = session.GrepString("/foo")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("/foo"))
session = podmanTest.Podman([]string{"run", "--rm", "--env", "FOO=BAR,BAZ", ALPINE, "printenv", "FOO"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ = session.GrepString("BAR,BAZ")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("BAR,BAZ"))
session = podmanTest.Podman([]string{"run", "--rm", "--env", "PATH=/bin", ALPINE, "printenv", "PATH"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ = session.GrepString("/bin")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("/bin"))
os.Setenv("FOO", "BAR")
session = podmanTest.Podman([]string{"run", "--rm", "--env", "FOO", ALPINE, "printenv", "FOO"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ = session.GrepString("BAR")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("BAR"))
os.Unsetenv("FOO")
session = podmanTest.Podman([]string{"run", "--rm", "--env", "FOO", ALPINE, "printenv", "FOO"})
@ -86,8 +80,7 @@ var _ = Describe("Podman run", func() {
session = podmanTest.Podman([]string{"run", "--rm", ALPINE, "sh", "-c", "printenv"})
session.Wait(10)
Expect(session).Should(Exit(0))
match, _ = session.GrepString("HOSTNAME")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("HOSTNAME"))
})
It("podman run --env-host environment test", func() {
@ -101,14 +94,12 @@ var _ = Describe("Podman run", func() {
return
}
Expect(session).Should(Exit(0))
match, _ := session.GrepString("BAR")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("BAR"))
session = podmanTest.PodmanAsUser([]string{"run", "--rm", "--env", "FOO=BAR1", "--env-host", ALPINE, "/bin/printenv", "FOO"}, 0, 0, "", env)
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ = session.GrepString("BAR1")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("BAR1"))
os.Unsetenv("FOO")
})
@ -121,8 +112,7 @@ var _ = Describe("Podman run", func() {
session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "http_proxy"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ := session.GrepString("1.2.3.4")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("1.2.3.4"))
session = podmanTest.Podman([]string{"run", "--http-proxy=false", ALPINE, "printenv", "http_proxy"})
session.WaitWithDefaultTimeout()
@ -132,15 +122,13 @@ var _ = Describe("Podman run", func() {
session = podmanTest.Podman([]string{"run", "--env", "http_proxy=5.6.7.8", ALPINE, "printenv", "http_proxy"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ = session.GrepString("5.6.7.8")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("5.6.7.8"))
os.Unsetenv("http_proxy")
session = podmanTest.Podman([]string{"run", "--http-proxy=false", "--env", "http_proxy=5.6.7.8", ALPINE, "printenv", "http_proxy"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
match, _ = session.GrepString("5.6.7.8")
Expect(match).Should(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("5.6.7.8"))
os.Unsetenv("http_proxy")
})
})