From 3b9046a170119c9d3e2975f03587776842c126ec Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Wed, 27 Jun 2018 13:37:56 -0400 Subject: Remove the --registry flag from podman search Instead of setting the --registry flag to search a single registry, prefix the registry before the image name in the input, an example is `podman search registry.fedoraproject.org/fedora` and this will search for the fedora image in only registry.fedoraproject.org. Signed-off-by: umohnani8 Closes: #1011 Approved by: rhatdan --- test/e2e/search_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/e2e') diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index 7cd877db6..d743c3484 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -58,8 +58,8 @@ var _ = Describe("Podman search", func() { Expect(search.LineInOutputContains("docker.io/library/alpine")).To(BeTrue()) }) - It("podman search registry flag", func() { - search := podmanTest.Podman([]string{"search", "--registry", "registry.fedoraproject.org", "fedora-minimal"}) + It("podman search single registry flag", func() { + search := podmanTest.Podman([]string{"search", "registry.fedoraproject.org/fedora-minimal"}) search.WaitWithDefaultTimeout() Expect(search.ExitCode()).To(Equal(0)) Expect(search.LineInOutputContains("fedoraproject.org/fedora-minimal")).To(BeTrue()) @@ -128,7 +128,7 @@ var _ = Describe("Podman search", func() { Skip("Can not start docker registry.") } - search := podmanTest.Podman([]string{"search", "--registry", "localhost:5000", "fake/image:andtag", "--tls-verify=false"}) + search := podmanTest.Podman([]string{"search", "localhost:5000/fake/image:andtag", "--tls-verify=false"}) search.WaitWithDefaultTimeout() // if this test succeeded, there will be no output (there is no entry named fake/image:andtag in an empty registry) @@ -150,7 +150,7 @@ var _ = Describe("Podman search", func() { push := podmanTest.Podman([]string{"push", "--tls-verify=false", "--remove-signatures", ALPINE, "localhost:5000/my-alpine"}) push.WaitWithDefaultTimeout() Expect(push.ExitCode()).To(Equal(0)) - search := podmanTest.Podman([]string{"search", "--registry", "localhost:5000", "my-alpine", "--tls-verify=false"}) + search := podmanTest.Podman([]string{"search", "localhost:5000/my-alpine", "--tls-verify=false"}) search.WaitWithDefaultTimeout() Expect(search.ExitCode()).To(Equal(0)) @@ -176,7 +176,7 @@ var _ = Describe("Podman search", func() { os.Setenv("REGISTRIES_CONFIG_PATH", outfile) ioutil.WriteFile(outfile, regFileBytes, 0644) - search := podmanTest.Podman([]string{"search", "--registry", "localhost:5000", "my-alpine"}) + search := podmanTest.Podman([]string{"search", "localhost:5000/my-alpine"}) search.WaitWithDefaultTimeout() Expect(search.ExitCode()).To(Equal(0)) @@ -206,7 +206,7 @@ var _ = Describe("Podman search", func() { os.Setenv("REGISTRIES_CONFIG_PATH", outfile) ioutil.WriteFile(outfile, regFileBytes, 0644) - search := podmanTest.Podman([]string{"search", "--registry", "localhost:5000", "my-alpine", "--tls-verify=true"}) + search := podmanTest.Podman([]string{"search", "localhost:5000/my-alpine", "--tls-verify=true"}) search.WaitWithDefaultTimeout() Expect(search.ExitCode()).To(Equal(0)) @@ -236,7 +236,7 @@ var _ = Describe("Podman search", func() { os.Setenv("REGISTRIES_CONFIG_PATH", outfile) ioutil.WriteFile(outfile, regFileBytes, 0644) - search := podmanTest.Podman([]string{"search", "--registry", "localhost:5000", "my-alpine"}) + search := podmanTest.Podman([]string{"search", "localhost:5000/my-alpine"}) search.WaitWithDefaultTimeout() Expect(search.ExitCode()).To(Equal(0)) -- cgit v1.2.3-54-g00ecf