Merge pull request from baude/e2esincebefore

Fix images since/after tests
This commit is contained in:
OpenShift Merge Robot
2022-02-16 04:24:56 -05:00
committed by GitHub
2 changed files with 14 additions and 9 deletions
test
e2e
python/docker/compat

@ -187,23 +187,27 @@ WORKDIR /test
}) })
It("podman images filter since image", func() { It("podman images filter since image", func() {
dockerfile := `FROM quay.io/libpod/alpine:latest dockerfile := `FROM scratch
` `
podmanTest.BuildImage(dockerfile, "foobar.com/before:latest", "false") podmanTest.BuildImage(dockerfile, "foobar.com/one:latest", "false")
result := podmanTest.Podman([]string{"images", "-q", "-f", "since=quay.io/libpod/alpine:latest"}) podmanTest.BuildImage(dockerfile, "foobar.com/two:latest", "false")
podmanTest.BuildImage(dockerfile, "foobar.com/three:latest", "false")
result := podmanTest.PodmanNoCache([]string{"images", "-q", "-f", "since=foobar.com/one:latest"})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToStringArray()).To(HaveLen(9)) Expect(result.OutputToStringArray()).To(HaveLen(2))
}) })
It("podman image list filter after image", func() { It("podman image list filter after image", func() {
dockerfile := `FROM quay.io/libpod/alpine:latest dockerfile := `FROM scratch
` `
podmanTest.BuildImage(dockerfile, "foobar.com/before:latest", "false") podmanTest.BuildImage(dockerfile, "foobar.com/one:latest", "false")
result := podmanTest.Podman([]string{"image", "list", "-q", "-f", "after=quay.io/libpod/alpine:latest"}) podmanTest.BuildImage(dockerfile, "foobar.com/two:latest", "false")
podmanTest.BuildImage(dockerfile, "foobar.com/three:latest", "false")
result := podmanTest.Podman([]string{"image", "list", "-q", "-f", "after=foobar.com/one:latest"})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToStringArray()).Should(HaveLen(9), "list filter output: %q", result.OutputToString()) Expect(result.OutputToStringArray()).Should(HaveLen(2), "list filter output: %q", result.OutputToString())
}) })
It("podman images filter dangling", func() { It("podman images filter dangling", func() {

@ -87,7 +87,8 @@ class TestImages(unittest.TestCase):
def test_search_image(self): def test_search_image(self):
"""Search for image""" """Search for image"""
for r in self.client.images.search("alpine"): for r in self.client.images.search("alpine"):
self.assertIn("alpine", r["Name"]) # registry matches if string is in either one
self.assertIn("alpine", r["Name"]+" "+r["Description"].lower())
def test_search_bogus_image(self): def test_search_bogus_image(self):
"""Search for bogus image should throw exception""" """Search for bogus image should throw exception"""