diff options
author | Ed Santiago <santiago@redhat.com> | 2022-04-27 14:58:46 -0600 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2022-04-28 05:41:53 -0600 |
commit | b3f38c31b29b51440edd5913a90019efbced0862 (patch) | |
tree | 72749f8e3ddedee0bb882c186a7f3cee08fe5f1c /test/e2e/container_clone_test.go | |
parent | 2b8cafc0671fbbd155770f044b8216f050877192 (diff) | |
download | podman-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/container_clone_test.go')
-rw-r--r-- | test/e2e/container_clone_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/e2e/container_clone_test.go b/test/e2e/container_clone_test.go index 42b477da0..c47a89332 100644 --- a/test/e2e/container_clone_test.go +++ b/test/e2e/container_clone_test.go @@ -68,8 +68,8 @@ var _ = Describe("Podman container clone", func() { ctrInspect := podmanTest.Podman([]string{"inspect", clone.OutputToString()}) ctrInspect.WaitWithDefaultTimeout() Expect(ctrInspect).To(Exit(0)) - Expect(ctrInspect.InspectContainerToJSON()[0].ImageName).To(Equal(fedoraMinimal)) - Expect(ctrInspect.InspectContainerToJSON()[0].Name).To(Equal("new_name")) + Expect(ctrInspect.InspectContainerToJSON()[0]).To(HaveField("ImageName", fedoraMinimal)) + Expect(ctrInspect.InspectContainerToJSON()[0]).To(HaveField("Name", "new_name")) }) It("podman container clone name test", func() { @@ -84,7 +84,7 @@ var _ = Describe("Podman container clone", func() { cloneInspect.WaitWithDefaultTimeout() Expect(cloneInspect).To(Exit(0)) cloneData := cloneInspect.InspectContainerToJSON() - Expect(cloneData[0].Name).To(Equal("testing123")) + Expect(cloneData[0]).To(HaveField("Name", "testing123")) }) It("podman container clone resource limits override", func() { @@ -104,7 +104,7 @@ var _ = Describe("Podman container clone", func() { cloneInspect.WaitWithDefaultTimeout() Expect(cloneInspect).To(Exit(0)) cloneData := cloneInspect.InspectContainerToJSON() - Expect(createData[0].HostConfig.NanoCpus).To(Equal(cloneData[0].HostConfig.NanoCpus)) + Expect(createData[0].HostConfig).To(HaveField("NanoCpus", cloneData[0].HostConfig.NanoCpus)) create = podmanTest.Podman([]string{"create", "--memory=5", ALPINE}) create.WaitWithDefaultTimeout() @@ -122,7 +122,7 @@ var _ = Describe("Podman container clone", func() { cloneInspect.WaitWithDefaultTimeout() Expect(cloneInspect).To(Exit(0)) cloneData = cloneInspect.InspectContainerToJSON() - Expect(createData[0].HostConfig.MemorySwap).To(Equal(cloneData[0].HostConfig.MemorySwap)) + Expect(createData[0].HostConfig).To(HaveField("MemorySwap", cloneData[0].HostConfig.MemorySwap)) create = podmanTest.Podman([]string{"create", "--cpus=5", ALPINE}) create.WaitWithDefaultTimeout() @@ -145,7 +145,7 @@ var _ = Describe("Podman container clone", func() { Expect(cloneInspect).To(Exit(0)) cloneData = cloneInspect.InspectContainerToJSON() Expect(createData[0].HostConfig.NanoCpus).ToNot(Equal(cloneData[0].HostConfig.NanoCpus)) - Expect(cloneData[0].HostConfig.NanoCpus).To(Equal(nanoCPUs)) + Expect(cloneData[0].HostConfig).To(HaveField("NanoCpus", nanoCPUs)) create = podmanTest.Podman([]string{"create", ALPINE}) create.WaitWithDefaultTimeout() @@ -158,7 +158,7 @@ var _ = Describe("Podman container clone", func() { cloneInspect.WaitWithDefaultTimeout() Expect(cloneInspect).To(Exit(0)) cloneData = cloneInspect.InspectContainerToJSON() - Expect(cloneData[0].HostConfig.MemorySwappiness).To(Equal(int64(0))) + Expect(cloneData[0].HostConfig).To(HaveField("MemorySwappiness", int64(0))) }) |