environs/config: more restrictive New

environs/tools/storage_test.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package tools_test
 
 import (
         "bytes"
         "io"
         "io/ioutil"
         "net/http"
@@ skipping 52 matching lines @@
         path = envtools.StorageName(vers)
         c.Assert(path, gc.Equals, "tools/juju-1.2.3-precise-amd64.tgz")
 }
 
 func (s *StorageSuite) TestReadListEmpty(c *gc.C) {
         store := s.env.Storage()
         _, err := envtools.ReadList(store, 2, 0)
         c.Assert(err, gc.Equals, envtools.ErrNoTools)
 }
 
-func (s *StorageSuite) TestReadList(c *gc.C) {
+func (s *StorageSuite) assertReadList(c *gc.C) {
+        defer func() {
+                envtools.SetToolPrefix(envtools.DefaultToolPrefix)
+        }()
         store := s.env.Storage()
         v001 := version.MustParseBinary("0.0.1-precise-amd64")
         t001 := envtesting.UploadFakeToolsVersion(c, store, v001)
         v100 := version.MustParseBinary("1.0.0-precise-amd64")
         t100 := envtesting.UploadFakeToolsVersion(c, store, v100)
         v101 := version.MustParseBinary("1.0.1-precise-amd64")
         t101 := envtesting.UploadFakeToolsVersion(c, store, v101)
         v111 := version.MustParseBinary("1.1.1-precise-amd64")
         t111 := envtesting.UploadFakeToolsVersion(c, store, v111)
 
@@ skipping 18 matching lines @@
                 list, err := envtools.ReadList(store, t.majorVersion, t.minorVersion)
                 if t.list != nil {
                         c.Assert(err, gc.IsNil)
                         c.Assert(list, gc.DeepEquals, t.list)
                 } else {
                         c.Assert(err, gc.Equals, coretools.ErrNoMatches)
                 }
         }
 }
 
+func (s *StorageSuite) TestReadListLegacyLocation(c *gc.C) {
+        envtools.SetToolPrefix(envtools.DefaultToolPrefix)
+        s.assertReadList(c)
+}
+
+func (s *StorageSuite) TestReadList(c *gc.C) {
+        envtools.SetToolPrefix(envtools.NewToolPrefix)
+        s.assertReadList(c)
+}
+
 func (s *StorageSuite) TestUpload(c *gc.C) {
         t, err := envtools.Upload(s.env.Storage(), nil)
         c.Assert(err, gc.IsNil)
         c.Assert(t.Version, gc.Equals, version.Current)
         c.Assert(t.URL, gc.Not(gc.Equals), "")
         dir := downloadTools(c, t)
         out, err := exec.Command(filepath.Join(dir, "jujud"), "version").CombinedOutput()
         c.Assert(err, gc.IsNil)
         c.Assert(string(out), gc.Equals, version.Current.String()+"\n")
 }
@@ skipping 90 matching lines @@
 func (*StorageSuite) TestSetenv(c *gc.C) {
         env0 := []string{"foo=bar", "arble="}
         for i, t := range setenvTests {
                 c.Logf("test %d", i)
                 env := make([]string, len(env0))
                 copy(env, env0)
                 env = envtools.Setenv(env, t.set)
                 c.Check(env, gc.DeepEquals, t.expect)
         }
 }