Fix integration-cli suite setup requirements

tophj-ibm · tophj-ibm · commit d800a4e1ba7d · 2016-01-29T16:35:20.000-05:00
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 &lt;tophj@linux.vnet.ibm.com&gt;
diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go
@@ -48,7 +48,7 @@ type DockerRegistrySuite struct {
 }
 
 func (s *DockerRegistrySuite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
+	testRequires(c, DaemonIsLinux, RegistryHosting)
 	s.reg = setupRegistry(c, false, false)
 	s.d = NewDaemon(c)
 }
@@ -76,7 +76,7 @@ type DockerSchema1RegistrySuite struct {
 }
 
 func (s *DockerSchema1RegistrySuite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
+	testRequires(c, DaemonIsLinux, RegistryHosting)
 	s.reg = setupRegistry(c, true, false)
 	s.d = NewDaemon(c)
 }
@@ -104,7 +104,7 @@ type DockerRegistryAuthSuite struct {
 }
 
 func (s *DockerRegistryAuthSuite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
+	testRequires(c, DaemonIsLinux, RegistryHosting)
 	s.reg = setupRegistry(c, false, true)
 	s.d = NewDaemon(c)
 }
@@ -158,6 +158,7 @@ type DockerTrustSuite struct {
 }
 
 func (s *DockerTrustSuite) SetUpTest(c *check.C) {
+	testRequires(c, RegistryHosting, NotaryHosting)
 	s.reg = setupRegistry(c, false, false)
 	s.not = setupNotary(c)
 }
diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go
@@ -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)
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ type DockerRegistrySuite struct {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func (s DockerRegistrySuite) SetUpTest(c check.C) {`
`51`		`- testRequires(c, DaemonIsLinux)`
	`51`	`+ testRequires(c, DaemonIsLinux, RegistryHosting)`
`52`	`52`	`s.reg = setupRegistry(c, false, false)`
`53`	`53`	`s.d = NewDaemon(c)`
`54`	`54`	`}`
`@@ -76,7 +76,7 @@ type DockerSchema1RegistrySuite struct {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`func (s DockerSchema1RegistrySuite) SetUpTest(c check.C) {`
`79`		`- testRequires(c, DaemonIsLinux)`
	`79`	`+ testRequires(c, DaemonIsLinux, RegistryHosting)`
`80`	`80`	`s.reg = setupRegistry(c, true, false)`
`81`	`81`	`s.d = NewDaemon(c)`
`82`	`82`	`}`
`@@ -104,7 +104,7 @@ type DockerRegistryAuthSuite struct {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`func (s DockerRegistryAuthSuite) SetUpTest(c check.C) {`
`107`		`- testRequires(c, DaemonIsLinux)`
	`107`	`+ testRequires(c, DaemonIsLinux, RegistryHosting)`
`108`	`108`	`s.reg = setupRegistry(c, false, true)`
`109`	`109`	`s.d = NewDaemon(c)`
`110`	`110`	`}`
`@@ -158,6 +158,7 @@ type DockerTrustSuite struct {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`func (s DockerTrustSuite) SetUpTest(c check.C) {`
	`161`	`+ testRequires(c, RegistryHosting, NotaryHosting)`
`161`	`162`	`s.reg = setupRegistry(c, false, false)`
`162`	`163`	`s.not = setupNotary(c)`
`163`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1573,7 +1573,6 @@ func daemonTime(c *check.C) time.Time {`
`1573`	`1573`	`}`
`1574`	`1574`
`1575`	`1575`	`func setupRegistry(c check.C, schema1, auth bool) testRegistryV2 {`
`1576`		`- testRequires(c, RegistryHosting)`
`1577`	`1576`	`reg, err := newTestRegistryV2(c, schema1, auth)`
`1578`	`1577`	`c.Assert(err, check.IsNil)`
`1579`	`1578`
`@@ -1590,7 +1589,6 @@ func setupRegistry(c check.C, schema1, auth bool) testRegistryV2 {`
`1590`	`1589`	`}`
`1591`	`1590`
`1592`	`1591`	`func setupNotary(c check.C) testNotary {`
`1593`		`- testRequires(c, NotaryHosting)`
`1594`	`1592`	`ts, err := newTestNotary(c)`
`1595`	`1593`	`c.Assert(err, check.IsNil)`
`1596`	`1594`