Add simplestreams tools retry logic

environs/tools/urls_test.go

Index: environs/tools/urls_test.go
=== modified file 'environs/tools/urls_test.go'
--- environs/tools/urls_test.go	2013-09-12 14:16:48 +0000
+++ environs/tools/urls_test.go	2013-09-18 07:36:07 +0000
@@ -8,9 +8,11 @@
 
 	"launchpad.net/juju-core/environs"
 	sstesting "launchpad.net/juju-core/environs/simplestreams/testing"
+	"launchpad.net/juju-core/environs/storage"
 	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
+	jc "launchpad.net/juju-core/testing/checkers"
 )
 
 type URLsSuite struct {
@@ -59,4 +61,26 @@
 	c.Assert(err, gc.IsNil)
 	sstesting.AssertExpectedSources(c, sources, []string{
 		"config-tools-url/", privateStorageURL, "https://juju.canonical.com/tools/"})
+	haveExpectedSources := false
+	for _, source := range sources {
+		haveExpectedSources = true
+		if allowRetry, ok := storage.TestingGetAllowRetry(source); ok {
+			c.Assert(allowRetry, jc.IsFalse)
+		}
+	}
+	c.Assert(haveExpectedSources, jc.IsTrue)

[fwereade, 2013/09/19 12:59:38]

doesn't the AssertExpectedSources guarantee that we'll get at least one pass
through the loop? AFAICT that's all that haveExpectedSources is verifying.

[wallyworld, 2013/09/20 00:33:57]

Bah. haveExpectedSources = true was in the wrong spot. Fixed.

+}
+
+func (s *URLsSuite) TestToolsSourcesWithRetry(c *gc.C) {
+	env := s.env(c, "")
+	sources, err := tools.GetMetadataSourcesWithRetries(env, true)
+	c.Assert(err, gc.IsNil)
+	haveExpectedSources := false
+	for _, source := range sources {
+		haveExpectedSources = true
+		if allowRetry, ok := storage.TestingGetAllowRetry(source); ok {
+			c.Assert(allowRetry, jc.IsTrue)
+		}
+	}
+	c.Assert(haveExpectedSources, jc.IsTrue)
 }

[fwereade, 2013/09/19 12:59:38]

Is this missing an AssertExpectedSources?

[wallyworld, 2013/09/20 00:33:57]

Sigh. Yes.