docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

integration-cli: log error when starting registry 

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-01-10 19:10:45 +01:00
parent 0cdfd84aee
commit 55cec657bb
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration-cli/docker_cli_by_digest_test.go
View File

@ -18,7 +18,7 @@ import (
var ( var (
remoteRepoName = "dockercli/busybox-by-dgst" 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]+") pushDigestRegex = regexp.MustCompile("[\\S]+: digest: ([\\S]+) size: [0-9]+")
digestRegex = regexp.MustCompile("Digest: ([\\S]+)") digestRegex = regexp.MustCompile("Digest: ([\\S]+)")
) )

2
integration-cli/docker_utils.go
View File

@ -1567,7 +1567,7 @@ func setupRegistry(c *check.C) *testRegistryV2 {
time.Sleep(100 * time.Millisecond) 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 return reg
} }

2
integration-cli/registry.go
View File

@ -61,7 +61,7 @@ func (t *testRegistryV2) Ping() error {
if err != nil { if err != nil {
return err 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 fmt.Errorf("registry ping replied with an unexpected status code %d", resp.StatusCode)
} }
return nil return nil

1
integration-cli/registry_mock.go
View File

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