diff options
author | Ed Santiago <santiago@redhat.com> | 2021-12-01 08:22:56 -0700 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2021-12-02 07:54:53 -0700 |
commit | c676495468397b16e228a37c45c3e02bb9832779 (patch) | |
tree | 1129a161ef7a337e8657188c29779711020cde0f | |
parent | 478f2da5d6bedf6390be1c0f3928f9ec13894d6d (diff) | |
download | podman-c676495468397b16e228a37c45c3e02bb9832779.tar.gz podman-c676495468397b16e228a37c45c3e02bb9832779.tar.bz2 podman-c676495468397b16e228a37c45c3e02bb9832779.zip |
Same as previous, for assertions other than Equal()
sed -i -e 's/Expect(\(.*\)\[\(\".*\"\)\])\.To(\(.*\)/Expect(\1).To(HaveKeyWithValue(\2, \3)/' test/e2e/*_test.go
Signed-off-by: Ed Santiago <santiago@redhat.com>
-rw-r--r-- | test/e2e/play_kube_test.go | 4 | ||||
-rw-r--r-- | test/e2e/run_networking_test.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index fc939711f..bcab92b97 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -2012,8 +2012,8 @@ spec: ctr := inspect.InspectContainerToJSON() Expect(ctr[0].Config.WorkingDir).To(ContainSubstring("/etc")) - Expect(ctr[0].Config.Labels["key1"]).To(ContainSubstring("value1")) - Expect(ctr[0].Config.Labels["key1"]).To(ContainSubstring("value1")) + Expect(ctr[0].Config.Labels).To(HaveKeyWithValue("key1", ContainSubstring("value1"))) + Expect(ctr[0].Config.Labels).To(HaveKeyWithValue("key1", ContainSubstring("value1"))) Expect(ctr[0].Config.StopSignal).To(Equal(uint(51))) }) diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 22ec27346..d73bd43a7 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -526,7 +526,7 @@ EXPOSE 2004-2005/tcp`, ALPINE) containerConfig := inspect.InspectContainerToJSON() Expect(containerConfig[0].NetworkSettings.Ports).To(Not(BeNil())) - Expect(containerConfig[0].NetworkSettings.Ports["80/tcp"]).To(Not(BeNil())) + Expect(containerConfig[0].NetworkSettings.Ports).To(HaveKeyWithValue("80/tcp", Not(BeNil()))) Expect(containerConfig[0].NetworkSettings.Ports["80/tcp"][0].HostPort).ToNot(Equal(80)) }) |