diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-16 11:33:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 11:33:43 -0500 |
| commit | aa1a6b6eaaa6700c0c0f42b60837bbf1b1af3c55 (patch) | |
| tree | e3b90ebd47c6bf76fedff00ddf217626c4899082 | |
| parent | ab3e566d747551492dac8410c3023915491e2540 (diff) | |
| parent | 09708bee9c9057da5cc414506ca7b8a6678d3721 (diff) | |
| download | podman-aa1a6b6eaaa6700c0c0f42b60837bbf1b1af3c55.tar.gz podman-aa1a6b6eaaa6700c0c0f42b60837bbf1b1af3c55.tar.bz2 podman-aa1a6b6eaaa6700c0c0f42b60837bbf1b1af3c55.zip | |
Merge pull request #13249 from baude/backporte2efixes
[BACKPORT] Backporte2efixes
| -rw-r--r-- | test/e2e/images_test.go | 20 | ||||
| -rw-r--r-- | test/python/docker/compat/test_images.py | 3 |
2 files changed, 14 insertions, 9 deletions
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 0a4d9b134..6a534c9c8 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -187,23 +187,27 @@ WORKDIR /test }) 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") - result := podmanTest.Podman([]string{"images", "-q", "-f", "since=quay.io/libpod/alpine:latest"}) + podmanTest.BuildImage(dockerfile, "foobar.com/one:latest", "false") + 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() 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() { - dockerfile := `FROM quay.io/libpod/alpine:latest + dockerfile := `FROM scratch ` - podmanTest.BuildImage(dockerfile, "foobar.com/before:latest", "false") - result := podmanTest.Podman([]string{"image", "list", "-q", "-f", "after=quay.io/libpod/alpine:latest"}) + podmanTest.BuildImage(dockerfile, "foobar.com/one:latest", "false") + 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() 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() { diff --git a/test/python/docker/compat/test_images.py b/test/python/docker/compat/test_images.py index 485a0e419..05d0e3e12 100644 --- a/test/python/docker/compat/test_images.py +++ b/test/python/docker/compat/test_images.py @@ -87,7 +87,8 @@ class TestImages(unittest.TestCase): def test_search_image(self): """Search for image""" 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): """Search for bogus image should throw exception""" |