enable search tests

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

2 files changed, 16 insertions, 9 deletions

diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go
index df4d83554..a8abfb339 100644
--- a/cmd/podman/images/search.go
+++ b/cmd/podman/images/search.go
@@ -1,6 +1,7 @@
 package images
 
 import (
+	"os"
 	"reflect"
 	"strings"
 
@@ -47,14 +48,15 @@ var (
 
 	// Command: podman image search
 	imageSearchCmd = &cobra.Command{
-		Use:   searchCmd.Use,
-		Short: searchCmd.Short,
-		Long:  searchCmd.Long,
-		RunE:  searchCmd.RunE,
-		Args:  searchCmd.Args,
+		Use:         searchCmd.Use,
+		Short:       searchCmd.Short,
+		Long:        searchCmd.Long,
+		RunE:        searchCmd.RunE,
+		Args:        searchCmd.Args,
+		Annotations: searchCmd.Annotations,
 		Example: `podman image search --filter=is-official --limit 3 alpine
-		podman image search registry.fedoraproject.org/  # only works with v2 registries
-		podman image search --format "table {{.Index}} {{.Name}}" registry.fedoraproject.org/fedora`,
+  podman image search registry.fedoraproject.org/  # only works with v2 registries
+  podman image search --format "table {{.Index}} {{.Name}}" registry.fedoraproject.org/fedora`,
 	}
 )
 
@@ -108,7 +110,13 @@ func imageSearch(cmd *cobra.Command, args []string) error {
 	// which is important to implement a sane way of dealing with defaults of
 	// boolean CLI flags.
 	if cmd.Flags().Changed("tls-verify") {
-		searchOptions.SkipTLSVerify = types.NewOptionalBool(!pullOptions.TLSVerifyCLI)
+		searchOptions.SkipTLSVerify = types.NewOptionalBool(!searchOptions.TLSVerifyCLI)
+	}
+
+	if searchOptions.Authfile != "" {
+		if _, err := os.Stat(searchOptions.Authfile); err != nil {
+			return errors.Wrapf(err, "error getting authfile %s", searchOptions.Authfile)
+		}
 	}
 
 	searchReport, err := registry.ImageEngine().Search(registry.GetContext(), searchTerm, searchOptions.ImageSearchOptions)
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index 3c64fa05f..9ba0241fe 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -68,7 +68,6 @@ registries = ['{{.Host}}:{{.Port}}']`
 	registryFileTwoTmpl := template.Must(template.New("registryFileTwo").Parse(regFileContents2))
 
 	BeforeEach(func() {
-		Skip(v2fail)
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)