toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix integration-cli suite setup requirements

Browse Source 
This PR moves the testRequires check from within setupRegistry
and setupNotary to when the Suite itself starts up.

This fixes a bug where testRequires() in setupRegistry() would
succeed and start registry, but testRequires() in setupNotary()
would fail. This immediately exits the goroutine with registry
still running.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: d800a4e1ba7d23864aa541c1919465bcf22dd1a9
Component: engine
This commit is contained in:
Christopher Jones
2016-01-29 16:35:20 -05:00
parent 9d6400f4f2
commit 1a6ecfb6ce
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/integration-cli/docker_utils.go
View File

@ -1573,7 +1573,6 @@ func daemonTime(c *check.C) time.Time {
}
func setupRegistry(c *check.C, schema1, auth bool) *testRegistryV2 {
testRequires(c, RegistryHosting)
reg, err := newTestRegistryV2(c, schema1, auth)
c.Assert(err, check.IsNil)
@ -1590,7 +1589,6 @@ func setupRegistry(c *check.C, schema1, auth bool) *testRegistryV2 {
}
func setupNotary(c *check.C) *testNotary {
testRequires(c, NotaryHosting)
ts, err := newTestNotary(c)
c.Assert(err, check.IsNil)