From b62816578e38385167abdc401f04e776c54cce56 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Wed, 16 Feb 2022 10:33:57 +0100 Subject: e2e: merge after/since image-filter tests Merge the two tests to speed up testing. Both built the exact same images. Signed-off-by: Valentin Rothberg --- test/e2e/images_test.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'test/e2e') diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 6a534c9c8..d34c911ad 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -186,25 +186,21 @@ WORKDIR /test Expect(result.OutputToString()).To(Equal("/test")) }) - It("podman images filter since image", func() { + It("podman images filter since/after image", func() { dockerfile := `FROM scratch ` podmanTest.BuildImage(dockerfile, "foobar.com/one:latest", "false") podmanTest.BuildImage(dockerfile, "foobar.com/two:latest", "false") podmanTest.BuildImage(dockerfile, "foobar.com/three:latest", "false") + + // `since` filter result := podmanTest.PodmanNoCache([]string{"images", "-q", "-f", "since=foobar.com/one:latest"}) result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) Expect(result.OutputToStringArray()).To(HaveLen(2)) - }) - It("podman image list filter after image", func() { - dockerfile := `FROM scratch -` - 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"}) + // `after` filter + 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(2), "list filter output: %q", result.OutputToString()) -- cgit v1.2.3-54-g00ecf