diff options
author | Ed Santiago <santiago@redhat.com> | 2022-04-27 14:58:46 -0600 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2022-05-03 13:38:21 -0400 |
commit | ecc39b5958d4a51fa701932b98fab0a45f4c1893 (patch) | |
tree | 32e2c50b13979970a85ca5336f937f886f2bd16f /test/e2e/build_test.go | |
parent | e5d6b6b0a2cfdbb21506b8f5e741cf719c149cb4 (diff) | |
download | podman-ecc39b5958d4a51fa701932b98fab0a45f4c1893.tar.gz podman-ecc39b5958d4a51fa701932b98fab0a45f4c1893.tar.bz2 podman-ecc39b5958d4a51fa701932b98fab0a45f4c1893.zip |
Ginkgo: use HaveField() for better error checking
This is a very late followup to my ginkgo-improving work of 2021.
It has been stuck since December because it requires gomega 1.17,
which we've just enabled.
This commit is simply a copy-paste of a command I saved in
my TODO list many months ago:
sed -i -e 's/Expect(\([^ ]\+\)\.\([a-zA-Z0-9]\+\))\.To(Equal(/Expect(\1).To(HaveField(\"\2\", /' test/e2e/*_test.go
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/e2e/build_test.go')
-rw-r--r-- | test/e2e/build_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 0c665687d..b8aad1084 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -53,8 +53,8 @@ var _ = Describe("Podman build", func() { inspect := podmanTest.Podman([]string{"inspect", iid}) inspect.WaitWithDefaultTimeout() data := inspect.InspectImageJSON() - Expect(data[0].Os).To(Equal(runtime.GOOS)) - Expect(data[0].Architecture).To(Equal(runtime.GOARCH)) + Expect(data[0]).To(HaveField("Os", runtime.GOOS)) + Expect(data[0]).To(HaveField("Architecture", runtime.GOARCH)) session = podmanTest.Podman([]string{"rmi", ALPINE}) session.WaitWithDefaultTimeout() @@ -110,8 +110,8 @@ var _ = Describe("Podman build", func() { inspect := podmanTest.Podman([]string{"inspect", "test"}) inspect.WaitWithDefaultTimeout() data := inspect.InspectImageJSON() - Expect(data[0].Os).To(Equal(runtime.GOOS)) - Expect(data[0].Architecture).To(Equal(runtime.GOARCH)) + Expect(data[0]).To(HaveField("Os", runtime.GOOS)) + Expect(data[0]).To(HaveField("Architecture", runtime.GOARCH)) st, err := os.Stat(logfile) Expect(err).To(BeNil()) |