Reduce unnecessary s3 timeouts

environs/tools/tools_test.go

Index: environs/tools/tools_test.go
=== modified file 'environs/tools/tools_test.go'
--- environs/tools/tools_test.go	2013-09-13 02:02:59 +0000
+++ environs/tools/tools_test.go	2013-09-18 07:13:09 +0000
@@ -17,6 +17,7 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/simplestreams"
+	"launchpad.net/juju-core/environs/storage"
 	envtesting "launchpad.net/juju-core/environs/testing"
 	envtools "launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/errors"
@@ -66,7 +67,7 @@
 	envtesting.RemoveAllTools(c, s.env)
 }
 
-func (s *LegacyToolsSuite) uploadVersions(c *gc.C, storage environs.Storage, verses ...version.Binary) map[version.Binary]string {
+func (s *LegacyToolsSuite) uploadVersions(c *gc.C, storage storage.Storage, verses ...version.Binary) map[version.Binary]string {
 	uploaded := map[version.Binary]string{}
 	for _, vers := range verses {
 		uploaded[vers] = envtesting.UploadFakeToolsVersion(c, storage, vers).URL
@@ -79,7 +80,7 @@
 }
 
 func (s *LegacyToolsSuite) uploadPublic(c *gc.C, verses ...version.Binary) map[version.Binary]string {
-	storage := s.env.PublicStorage().(environs.Storage)
+	storage := s.env.PublicStorage().(storage.Storage)

[thumper, 2013/09/18 22:10:49]

I don't think this will work. Or if it does work, it is slightly confusing.  If
Go used a different namespace separator from a method call, there would never be
confusion between variables and packages.

[wallyworld, 2013/09/18 22:55:51]

Ah, I already changed a bunch of these. I missed some. Thanks, will fix. I also
found a few more.

 	return s.uploadVersions(c, storage, verses...)
 }
 
@@ -150,7 +151,7 @@
 	return objects
 }
 
-func (s *SimpleStreamsToolsSuite) uploadToStorage(c *gc.C, storage environs.Storage, verses ...version.Binary) map[version.Binary]string {
+func (s *SimpleStreamsToolsSuite) uploadToStorage(c *gc.C, storage storage.Storage, verses ...version.Binary) map[version.Binary]string {
 	uploaded := map[version.Binary]string{}
 	if len(verses) == 0 {
 		return uploaded