opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-18 15:39:08 +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

14
test/e2e/diff_test.go
View File

@ -64,8 +64,8 @@ var _ = Describe("Podman diff", func() {
session.WaitWithDefaultTimeout()
containerDiff := session.OutputToStringArray()
sort.Strings(containerDiff)
Expect(session.LineInOutputContains("C /tmp")).To(BeTrue())
Expect(session.LineInOutputContains("A /tmp/diff-test")).To(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("C /tmp"))
Expect(session.OutputToString()).To(ContainSubstring("A /tmp/diff-test"))
session = podmanTest.Podman([]string{"commit", "diff-test", "diff-test-img"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
@ -88,8 +88,8 @@ var _ = Describe("Podman diff", func() {
session.WaitWithDefaultTimeout()
containerDiff := session.OutputToStringArray()
sort.Strings(containerDiff)
Expect(session.LineInOutputContains("C /tmp")).To(BeTrue())
Expect(session.LineInOutputContains("A /tmp/diff-test")).To(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("C /tmp"))
Expect(session.OutputToString()).To(ContainSubstring("A /tmp/diff-test"))
Expect(session).Should(Exit(0))
})
@ -127,9 +127,9 @@ RUN echo test
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 4))
Expect(session.LineInOutputContains("A " + file1)).To(BeTrue())
Expect(session.LineInOutputContains("A " + file2)).To(BeTrue())
Expect(session.LineInOutputContains("A " + file3)).To(BeTrue())
Expect(session.OutputToString()).To(ContainSubstring("A " + file1))
Expect(session.OutputToString()).To(ContainSubstring("A " + file2))
Expect(session.OutputToString()).To(ContainSubstring("A " + file3))
})
It("podman image diff of single image", func() {