GitList

Browse code

Merge pull request #19219 from runcom/add-log

integration-cli: log error when starting registry

David Calavera authored on 2016/01/16 02:44:47
Showing 4 changed files

integration-cli/docker_cli_by_digest_test.go index 9cc0073..44466e7 100644
integration-cli/docker_utils.go index 4734c89..b6177c5 100644
integration-cli/registry.go index 26aebdf..d4038d2 100644
integration-cli/registry_mock.go index 5884eaa..300bf46 100644

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

History View file @ b63b43d

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

History View file @ b63b43d

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

History View file @ b63b43d

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

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

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