Deprecate public-bucket-url

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-20 00:33:38 +0000
+++ environs/tools/tools_test.go	2013-09-20 02:04:55 +0000
@@ -8,6 +8,7 @@
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"time"
 
@@ -151,20 +152,20 @@
 	return objects
 }
 
-func (s *SimpleStreamsToolsSuite) uploadToStorage(c *gc.C, storage storage.Storage, verses ...version.Binary) map[version.Binary]string {
+func (s *SimpleStreamsToolsSuite) uploadToStorage(c *gc.C, stor 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()))
+		uploaded[vers], err = stor.URL(fmt.Sprintf("tools/releases/tools-%s.tar.gz", vers.String()))
 		c.Assert(err, gc.IsNil)
 	}
 	objects := s.generateMetadata(c, verses...)
 	for _, object := range objects {
-		path := filepath.Join("tools", object.path)
-		err = storage.Put(path, bytes.NewReader(object.data), int64(len(object.data)))
+		toolspath := path.Join("tools", object.path)
+		err = stor.Put(toolspath, bytes.NewReader(object.data), int64(len(object.data)))
 		c.Assert(err, gc.IsNil)
 	}
 	return uploaded