diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-11-30 09:15:44 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-11-30 09:51:06 -0700 |
| commit | 12787963b04f91a7fec9aa0d6915666e43aeb269 (patch) | |
| tree | a20496b9a5221c6bd042fd5ad93c46f61a3f228f /test/e2e/build_test.go | |
| parent | 3fac03cf04e68eb3351aff8c33bac6bea85810f6 (diff) | |
| download | podman-12787963b04f91a7fec9aa0d6915666e43aeb269.tar.gz podman-12787963b04f91a7fec9aa0d6915666e43aeb269.tar.bz2 podman-12787963b04f91a7fec9aa0d6915666e43aeb269.zip | |
e2e tests: more cleanup of BeTrue()s
Write a BeValidJSON() matcher, and replace IsJSONOutputValid():
sed -i -e 's/Expect(\(.*\)\.IsJSONOutputValid()).To(BeTrue())/Expect(\1.OutputToString())\.To(BeValidJSON())/' test/e2e/*_test.go
(Plus a few manual tweaks)
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/e2e/build_test.go')
| -rw-r--r-- | test/e2e/build_test.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 420ed929f..1be5753f5 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -388,13 +388,10 @@ subdir**` session := podmanTest.Podman([]string{"build", "-t", "test", "."}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - ok, _ := session.GrepString("/testfilter/dummy1") - Expect(ok).NotTo(BeTrue()) - Expect(session.OutputToString()).To(ContainSubstring("/testfilter/dummy2")) - ok, _ = session.GrepString("/testfilter/subdir") - Expect(ok).NotTo(BeTrue()) //.dockerignore filters both subdir and inside subdir - ok, _ = session.GrepString("/testfilter/subdir/dummy3") - Expect(ok).NotTo(BeTrue()) + output := session.OutputToString() + Expect(output).To(ContainSubstring("/testfilter/dummy2")) + Expect(output).NotTo(ContainSubstring("/testfilter/dummy1")) + Expect(output).NotTo(ContainSubstring("/testfilter/subdir")) }) It("podman remote test context dir contains empty dirs and symlinks", func() { |