Merge pull request #19219 from runcom/add-log

integration-cli: log error when starting registry

integration-cli/docker_cli_by_digest_test.go

@@ -19,7 +19,7 @@ import (
 
 var (
 	remoteRepoName  = "dockercli/busybox-by-dgst"
-	repoName        = fmt.Sprintf("%v/%s", privateRegistryURL, remoteRepoName)
+	repoName        = fmt.Sprintf("%s/%s", privateRegistryURL, remoteRepoName)
 	pushDigestRegex = regexp.MustCompile("[\\S]+: digest: ([\\S]+) size: [0-9]+")
 	digestRegex     = regexp.MustCompile("Digest: ([\\S]+)")
 )

integration-cli/docker_utils.go

@@ -1567,7 +1567,7 @@ func setupRegistry(c *check.C, schema1 bool) *testRegistryV2 {
 		time.Sleep(100 * time.Millisecond)
 	}
 
-	c.Assert(err, check.IsNil, check.Commentf("Timeout waiting for test registry to become available"))
+	c.Assert(err, check.IsNil, check.Commentf("Timeout waiting for test registry to become available: %v", err))
 	return reg
 }
 

integration-cli/registry.go

@@ -68,7 +68,7 @@ func (t *testRegistryV2) Ping() error {
 	if err != nil {
 		return err
 	}
-	if resp.StatusCode != 200 {
+	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("registry ping replied with an unexpected status code %d", resp.StatusCode)
 	}
 	return nil

integration-cli/registry_mock.go

@@ -37,7 +37,6 @@ func newTestRegistry(c *check.C) (*testRegistry, error) {
 			matched, err = regexp.MatchString(re, url)
 			if err != nil {
 				c.Fatal("Error with handler regexp")
-				return
 			}
 			if matched {
 				function(w, r)