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/diff_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/diff_test.go')
| -rw-r--r-- | test/e2e/diff_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index 65ec0d1de..71696f5b6 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -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() { |