beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #19219 from runcom/add-log

Browse source 
integration-cli: log error when starting registry
This commit is contained in:
David Calavera 2016-01-15 09:44:47 -08:00
commit b63b43dc4c
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

@ -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]+)")
)

2
integration-cli/docker_utils.go
View file

@ -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
}

2
integration-cli/registry.go
View file

@ -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

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)
if err != nil {
c.Fatal("Error with handler regexp")
return
}
if matched {
function(w, r)