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/checkpoint_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/checkpoint_test.go')
-rw-r--r-- | test/e2e/checkpoint_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 2dc99bdc9..ac1677539 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -99,9 +99,9 @@ var _ = Describe("Podman checkpoint", func() { inspectOut := inspect.InspectContainerToJSON() Expect(inspectOut[0].State.Checkpointed).To(BeFalse(), ".State.Checkpointed") Expect(inspectOut[0].State.Restored).To(BeFalse(), ".State.Restored") - Expect(inspectOut[0].State.CheckpointPath).To(Equal("")) - Expect(inspectOut[0].State.CheckpointLog).To(Equal("")) - Expect(inspectOut[0].State.RestoreLog).To(Equal("")) + Expect(inspectOut[0].State).To(HaveField("CheckpointPath", "")) + Expect(inspectOut[0].State).To(HaveField("CheckpointLog", "")) + Expect(inspectOut[0].State).To(HaveField("RestoreLog", "")) result := podmanTest.Podman([]string{ "container", @@ -125,7 +125,7 @@ var _ = Describe("Podman checkpoint", func() { Expect(inspectOut[0].State.Restored).To(BeFalse(), ".State.Restored") Expect(inspectOut[0].State.CheckpointPath).To(ContainSubstring("userdata/checkpoint")) Expect(inspectOut[0].State.CheckpointLog).To(ContainSubstring("userdata/dump.log")) - Expect(inspectOut[0].State.RestoreLog).To(Equal("")) + Expect(inspectOut[0].State).To(HaveField("RestoreLog", "")) result = podmanTest.Podman([]string{ "container", @@ -179,9 +179,9 @@ var _ = Describe("Podman checkpoint", func() { inspectOut = inspect.InspectContainerToJSON() Expect(inspectOut[0].State.Checkpointed).To(BeFalse(), ".State.Checkpointed") Expect(inspectOut[0].State.Restored).To(BeFalse(), ".State.Restored") - Expect(inspectOut[0].State.CheckpointPath).To(Equal("")) - Expect(inspectOut[0].State.CheckpointLog).To(Equal("")) - Expect(inspectOut[0].State.RestoreLog).To(Equal("")) + Expect(inspectOut[0].State).To(HaveField("CheckpointPath", "")) + Expect(inspectOut[0].State).To(HaveField("CheckpointLog", "")) + Expect(inspectOut[0].State).To(HaveField("RestoreLog", "")) }) It("podman checkpoint a running container by name", func() { |