diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-23 10:54:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-23 10:54:40 +0100 |
| commit | a55473bea80c2d9e5d79ac97a2bfe313622033f9 (patch) | |
| tree | 90d0bdcb144a8fb74d75c93fa518b573309cf74f /test/e2e/load_test.go | |
| parent | 1bfbb28b0365790552483b961b4bd48a69dd8070 (diff) | |
| parent | 49d63ad5c120919ff6669baae2ebbd2b81f5c11a (diff) | |
| download | podman-a55473bea80c2d9e5d79ac97a2bfe313622033f9.tar.gz podman-a55473bea80c2d9e5d79ac97a2bfe313622033f9.tar.bz2 podman-a55473bea80c2d9e5d79ac97a2bfe313622033f9.zip | |
Merge pull request #12387 from edsantiago/remove_betrue
e2e tests: clean up antihelpful BeTrue()s
Diffstat (limited to 'test/e2e/load_test.go')
| -rw-r--r-- | test/e2e/load_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index a3ee1814a..e79c1eb8a 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -214,7 +214,7 @@ var _ = Describe("Podman load", func() { result := podmanTest.Podman([]string{"images", "hello:world"}) result.WaitWithDefaultTimeout() Expect(result.LineInOutputContains("docker")).To(Not(BeTrue())) - Expect(result.LineInOutputContains("localhost")).To(BeTrue()) + Expect(result.OutputToString()).To(ContainSubstring("localhost")) }) It("podman load localhost registry from scratch and :latest", func() { @@ -239,7 +239,7 @@ var _ = Describe("Podman load", func() { result := podmanTest.Podman([]string{"images", "hello:latest"}) result.WaitWithDefaultTimeout() Expect(result.LineInOutputContains("docker")).To(Not(BeTrue())) - Expect(result.LineInOutputContains("localhost")).To(BeTrue()) + Expect(result.OutputToString()).To(ContainSubstring("localhost")) }) It("podman load localhost registry from dir", func() { @@ -265,7 +265,7 @@ var _ = Describe("Podman load", func() { result := podmanTest.Podman([]string{"images", "load:latest"}) result.WaitWithDefaultTimeout() Expect(result.LineInOutputContains("docker")).To(Not(BeTrue())) - Expect(result.LineInOutputContains("localhost")).To(BeTrue()) + Expect(result.OutputToString()).To(ContainSubstring("localhost")) }) It("podman load xz compressed image", func() { @@ -290,7 +290,7 @@ var _ = Describe("Podman load", func() { result := podmanTest.Podman([]string{"load", "-i", "./testdata/docker-two-images.tar.xz"}) result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) - Expect(result.LineInOutputContains("example.com/empty:latest")).To(BeTrue()) - Expect(result.LineInOutputContains("example.com/empty/but:different")).To(BeTrue()) + Expect(result.OutputToString()).To(ContainSubstring("example.com/empty:latest")) + Expect(result.OutputToString()).To(ContainSubstring("example.com/empty/but:different")) }) }) |