Merge pull request #19424 from aaronlehmann/revert-multiple-pull-errors

Revert reporting of multiple pull errors
Upstream-commit: e8ce350669b0b8096ef2bb365ecad6fbfa966bfb
Component: engine

components/engine/integration-cli/docker_cli_pull_local_test.go

@@ -279,18 +279,6 @@ func (s *DockerSchema1RegistrySuite) TestPullIDStability(c *check.C) {
 	testPullIDStability(c)
 }
 
-// TestPullFallbackOn404 tries to pull a nonexistent manifest and confirms that
-// the pull falls back to the v1 protocol.
-//
-// Ref: docker/docker#18832
-func (s *DockerRegistrySuite) TestPullFallbackOn404(c *check.C) {
-	repoName := fmt.Sprintf("%v/does/not/exist", privateRegistryURL)
-
-	out, _, _ := dockerCmdWithError("pull", repoName)
-
-	c.Assert(out, checker.Contains, "v1 ping attempt")
-}
-
 func (s *DockerRegistrySuite) TestPullManifestList(c *check.C) {
 	testRequires(c, NotArm)
 	pushDigest, err := setupImage(c)