Reduce unnecessary s3 timeouts

environs/tools/tools_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package tools_test
 
 import (
         "bytes"
         "fmt"
         "io/ioutil"
         "os"
         "path/filepath"
         "time"
 
         gc "launchpad.net/gocheck"
         "launchpad.net/loggo"
 
         "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"
         "launchpad.net/juju-core/provider/dummy"
         "launchpad.net/juju-core/testing"
         jc "launchpad.net/juju-core/testing/checkers"
         coretools "launchpad.net/juju-core/tools"
         "launchpad.net/juju-core/version"
 )
 
@@ skipping 29 matching lines @@
 
 func setupToolsTests() {
         gc.Suite(&LegacyToolsSuite{})
         gc.Suite(&SimpleStreamsToolsSuite{})
 }
 
 func (s *LegacyToolsSuite) removeTools(c *gc.C) {
         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
         }
         return uploaded
 }
 
 func (s *LegacyToolsSuite) uploadCustom(c *gc.C, verses ...version.Binary) map[version.Binary]string {
         return s.uploadVersions(c, s.env.Storage(), verses...)
 }
 
 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...)
 }
 
 func (s *LegacyToolsSuite) reset(c *gc.C, attrs map[string]interface{}) {
         s.resetEnv(c, attrs)
 }
 
 func (s *LegacyToolsSuite) SetUpSuite(c *gc.C) {
         s.toolsTestHelper = s
 }
@@ skipping 50 matching lines @@
         }
         index, products, err := envtools.MarshalToolsMetadataJSON(metadata, time.Now())
         c.Assert(err, gc.IsNil)
         objects := []metadataFile{
                 {simplestreams.DefaultIndexPath + simplestreams.UnsignedSuffix, index},
                 {envtools.ProductMetadataPath, products},
         }
         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
         }
         var err error
         for _, vers := range verses {
                 uploaded[vers], err = storage.URL(fmt.Sprintf("tools/releases/tools-%s.tar.gz", vers.String()))
                 c.Assert(err, gc.IsNil)
         }
         objects := s.generateMetadata(c, verses...)
@@ skipping 407 matching lines @@
         c.Assert(err, gc.NotNil)
         c.Check(err, gc.ErrorMatches, "tools mismatch: expected series warty, got hoary")
 }
 
 func (s *ToolsListSuite) TestCheckToolsSeriesRejectsToolsForMixedSeries(c *gc.C) {
         list := fakeToolsList("precise", "raring")
         err := envtools.CheckToolsSeries(list, "precise")
         c.Assert(err, gc.NotNil)
         c.Check(err, gc.ErrorMatches, "expected single series, got .*")
 }