summaryrefslogtreecommitdiff
path: root/test/e2e/pull_test.go
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2022-04-27 14:58:46 -0600
committerEd Santiago <santiago@redhat.com>2022-04-28 05:41:53 -0600
commitb3f38c31b29b51440edd5913a90019efbced0862 (patch)
tree72749f8e3ddedee0bb882c186a7f3cee08fe5f1c /test/e2e/pull_test.go
parent2b8cafc0671fbbd155770f044b8216f050877192 (diff)
downloadpodman-b3f38c31b29b51440edd5913a90019efbced0862.tar.gz
podman-b3f38c31b29b51440edd5913a90019efbced0862.tar.bz2
podman-b3f38c31b29b51440edd5913a90019efbced0862.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/pull_test.go')
-rw-r--r--test/e2e/pull_test.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
index 231869e8c..d13334651 100644
--- a/test/e2e/pull_test.go
+++ b/test/e2e/pull_test.go
@@ -514,7 +514,7 @@ var _ = Describe("Podman pull", func() {
Expect(data).To(HaveLen(1))
Expect(data[0].RepoTags).To(HaveLen(1))
Expect(data[0].RepoTags[0]).To(Equal(t.tag1))
- Expect(data[0].ID).To(Equal(image1))
+ Expect(data[0]).To(HaveField("ID", image1))
}
})
@@ -541,8 +541,8 @@ var _ = Describe("Podman pull", func() {
data := setup.InspectImageJSON() // returns []inspect.ImageData
Expect(data).To(HaveLen(1))
- Expect(data[0].Os).To(Equal(runtime.GOOS))
- Expect(data[0].Architecture).To(Equal("arm64"))
+ Expect(data[0]).To(HaveField("Os", runtime.GOOS))
+ Expect(data[0]).To(HaveField("Architecture", "arm64"))
})
It("podman pull --arch", func() {
@@ -568,7 +568,7 @@ var _ = Describe("Podman pull", func() {
data := setup.InspectImageJSON() // returns []inspect.ImageData
Expect(data).To(HaveLen(1))
- Expect(data[0].Os).To(Equal(runtime.GOOS))
- Expect(data[0].Architecture).To(Equal("arm64"))
+ Expect(data[0]).To(HaveField("Os", runtime.GOOS))
+ Expect(data[0]).To(HaveField("Architecture", "arm64"))
})
})