TestPullNonExistingImage: Move to integration

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

integration-cli/docker_cli_pull_test.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"fmt"
 	"regexp"
 	"strings"
 	"testing"
@@ -50,43 +49,6 @@ func (s *DockerHubPullSuite) TestPullFromCentralRegistry(c *testing.T) {
 	assert.Assert(c, match, "invalid output for `docker images` (expected image and tag name)")
 }
 
-// TestPullNonExistingImage pulls non-existing images from the central registry, with different
-// combinations of implicit tag and library prefix.
-func (s *DockerHubPullSuite) TestPullNonExistingImage(c *testing.T) {
-	testRequires(c, DaemonIsLinux)
-
-	for _, ref := range []string{
-		"asdfasdf:foobar",
-		"library/asdfasdf:foobar",
-		"asdfasdf",
-		"asdfasdf:latest",
-		"library/asdfasdf",
-		"library/asdfasdf:latest",
-	} {
-		ref := ref
-		all := strings.Contains(ref, ":")
-		c.Run(ref, func(t *testing.T) {
-			t.Parallel()
-
-			var out string
-			var err error
-			if all {
-				out, err = s.CmdWithError("pull", "-a", repoName)
-			} else {
-				out, err = s.CmdWithError("pull", repoName)
-			}
-
-			expectedRepo := "asdfasdf"
-			assert.Check(t, is.ErrorContains(err, ""), "expected non-zero exit status when pulling non-existing image: %s", out)
-			assert.Check(t, is.Contains(out, fmt.Sprintf("pull access denied for %s, repository does not exist or may require 'docker login'", expectedRepo)))
-			if all {
-				// pull -a on a nonexistent registry should fall back as well
-				assert.Check(t, !strings.Contains(out, "unauthorized"), `message should not contain "unauthorized"`)
-			}
-		})
-	}
-}
-
 // TestPullFromCentralRegistryImplicitRefParts pulls an image from the central registry and verifies
 // that pulling the same image with different combinations of implicit elements of the image
 // reference (tag, repository, central registry url, ...) doesn't trigger a new pull nor leads to

integration/image/pull_test.go

@@ -3,9 +3,11 @@ package image
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"os"
 	"path"
+	"strings"
 	"testing"
 
 	"github.com/containerd/containerd"
@@ -21,6 +23,7 @@ import (
 	"github.com/opencontainers/image-spec/specs-go"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"gotest.tools/v3/assert"
+	is "gotest.tools/v3/assert/cmp"
 	"gotest.tools/v3/skip"
 )
 
@@ -155,3 +158,40 @@ func TestImagePullStoredfDigestForOtherRepo(t *testing.T) {
 	assert.Assert(t, err != nil, "Expected error, got none: %v", err)
 	assert.Assert(t, errdefs.IsNotFound(err), err)
 }
+
+// TestImagePullNonExisting pulls non-existing images from the central registry, with different
+// combinations of implicit tag and library prefix.
+func TestImagePullNonExisting(t *testing.T) {
+	ctx := setupTest(t)
+
+	for _, ref := range []string{
+		"asdfasdf:foobar",
+		"library/asdfasdf:foobar",
+		"asdfasdf",
+		"asdfasdf:latest",
+		"library/asdfasdf",
+		"library/asdfasdf:latest",
+	} {
+		ref := ref
+		all := strings.Contains(ref, ":")
+		t.Run(ref, func(t *testing.T) {
+			t.Parallel()
+
+			client := testEnv.APIClient()
+			rdr, err := client.ImagePull(ctx, ref, types.ImagePullOptions{
+				All: all,
+			})
+			if err == nil {
+				rdr.Close()
+			}
+
+			expectedMsg := fmt.Sprintf("pull access denied for %s, repository does not exist or may require 'docker login'", "asdfasdf")
+			assert.Assert(t, is.ErrorContains(err, expectedMsg))
+			assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))
+			if all {
+				// pull -a on a nonexistent registry should fall back as well
+				assert.Check(t, !strings.Contains(err.Error(), "unauthorized"), `message should not contain "unauthorized"`)
+			}
+		})
+	}
+}