diff options
author | Ed Santiago <santiago@redhat.com> | 2021-11-22 10:54:22 -0700 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2021-11-22 14:37:43 -0700 |
commit | 97ab9176f77c4fc9c4413afad4d2dcf5fad824b6 (patch) | |
tree | fc67f0c7dd3304489f89fd58742d3c46431eb44a /test/e2e/image_scp_test.go | |
parent | 1bfbb28b0365790552483b961b4bd48a69dd8070 (diff) | |
download | podman-97ab9176f77c4fc9c4413afad4d2dcf5fad824b6.tar.gz podman-97ab9176f77c4fc9c4413afad4d2dcf5fad824b6.tar.bz2 podman-97ab9176f77c4fc9c4413afad4d2dcf5fad824b6.zip |
e2e tests: clean up antihelpful BeTrue()s
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>
Diffstat (limited to 'test/e2e/image_scp_test.go')
-rw-r--r-- | test/e2e/image_scp_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go index 3e7e8da48..63276e57f 100644 --- a/test/e2e/image_scp_test.go +++ b/test/e2e/image_scp_test.go @@ -77,7 +77,7 @@ var _ = Describe("podman image scp", func() { list := podmanTest.Podman([]string{"image", "list"}) // our image should now contain alpine loaded in from root list.WaitWithDefaultTimeout() Expect(list).To(Exit(0)) - Expect(list.LineInOutputStartsWith("quay.io/libpod/alpine")).To(BeTrue()) + Expect(list.OutputToStringArray()).To(ContainElement(HavePrefix("quay.io/libpod/alpine"))) scp = podmanTest.PodmanAsUser([]string{"image", "scp", "root@localhost::" + ALPINE}, 0, 0, "", env) //transfer from root to rootless (us) scp.WaitWithDefaultTimeout() |