Bootstrap uses tools matching major.minor

cmd/juju/bootstrap_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package main
 
 import (
         "io/ioutil"
         "os"
         "path/filepath"
 
@@ skipping 84 matching lines @@
                 usefulVersion.Series = env.Config().DefaultSeries()
                 envtesting.UploadFakeToolsVersion(c, env.Storage(), usefulVersion)
         }
 
         // Run command and check for uploads.
         opc, errc := runCommand(nil, new(BootstrapCommand), test.args...)
         if uploadCount > 0 {
                 for i := 0; i < uploadCount; i++ {
                         c.Check((<-opc).(dummy.OpPutFile).Env, gc.Equals, "peckham")
                 }
-                list, err := envtools.FindTools(env, version.Current.Major, coretools.Filter{})
+                list, err := envtools.FindTools(environs.StorageInstances(env), version.Current.Major, version.Current.Minor, coretools.Filter{})
                 c.Check(err, gc.IsNil)
                 c.Logf("found: " + list.String())
                 urls := list.URLs()
                 c.Check(urls, gc.HasLen, len(test.uploads))
                 for _, v := range test.uploads {
                         c.Logf("seeking: " + v)
                         vers := version.MustParseBinary(v)
                         _, found := urls[vers]
                         c.Check(found, gc.Equals, true)
                 }
@@ skipping 105 matching lines @@
         defer fake.Restore()
 
         // Bootstrap the environment now detects the missing
         // tools and automatically synchronizes them from the
         // storage above.
         ctx := coretesting.Context(c)
         code := cmd.Main(&BootstrapCommand{}, ctx, nil)
         c.Check(code, gc.Equals, 0)
 
         // Now check the available tools which are the 1.0.0 envtools.
-        checkTools(c, env, v100All)
+        checkTools(c, env, v120All)

[jameinel, 2013/08/27 13:08:52]

the comment should be updated to match.

[wallyworld, 2013/08/27 13:26:24]

Done.

 }
 
 func (s *BootstrapSuite) TestAutoSyncLocalSource(c *gc.C) {
         // Prepare a tools directory for testing and store the
         // dummy tools in there.
         source := createToolsSource(c)
 
         // Change the version and ensure its later restoring.
         origVersion := version.Current
         version.Current.Number = version.MustParse("1.2.3")
         defer func() {
                 version.Current = origVersion
         }()
 
         // Create home with dummy provider and remove all
         // of its envtools.
         env, fake := makeEmptyFakeHome(c)
         defer fake.Restore()
 
         // Bootstrap the environment with an invalid source.
         // The command returns with an error.
         ctx := coretesting.Context(c)
         code := cmd.Main(&BootstrapCommand{}, ctx, []string{"--source", c.MkDir()})
         c.Check(code, gc.Equals, 1)
 
         // Now check that there are no tools available.
-        _, err := envtools.FindTools(env, version.Current.Major, coretools.Filter{})
+        _, err := envtools.FindTools(environs.StorageInstances(env), version.Current.Major, version.Current.Minor, coretools.Filter{})
         c.Assert(err, gc.ErrorMatches, "no tools available")
 
         // Bootstrap the environment with the valid source. This time
         // the bootstrapping has to show no error, because the tools
         // are automatically synchronized.
         ctx = coretesting.Context(c)
         code = cmd.Main(&BootstrapCommand{}, ctx, []string{"--source", source})
         c.Check(code, gc.Equals, 0)
 
         // Now check the available tools which are the 1.0.0 envtools.
-        checkTools(c, env, v100All)
+        checkTools(c, env, v120All)

[jameinel, 2013/08/27 13:08:52]

ditto

[wallyworld, 2013/08/27 13:26:24]

Done.

 }
 
 // createToolsStore creates the fake tools store.
 func createToolsStore(c *gc.C) func() {
         storage, err := envtesting.NewEC2HTTPTestStorage("127.0.0.1")
         c.Assert(err, gc.IsNil)
         origLocation := sync.DefaultToolsLocation
         sync.DefaultToolsLocation = storage.Location()
         for _, vers := range vAll {
                 storage.PutBinary(vers)
@@ skipping 26 matching lines @@
         fake := coretesting.MakeFakeHome(c, envConfig)
         dummy.Reset()
         env, err := environs.NewFromName("peckham")
         c.Assert(err, gc.IsNil)
         envtesting.RemoveAllTools(c, env)
         return env, fake
 }
 
 // checkTools check if the environment contains the passed envtools.
 func checkTools(c *gc.C, env environs.Environ, expected []version.Binary) {
-        list, err := envtools.FindTools(env, version.Current.Major, coretools.Filter{})
+        list, err := envtools.FindTools(environs.StorageInstances(env), version.Current.Major, version.Current.Minor, coretools.Filter{})
         c.Check(err, gc.IsNil)
         c.Logf("found: " + list.String())
         urls := list.URLs()
         c.Check(urls, gc.HasLen, len(expected))
 }
 
 var (
         v100d64 = version.MustParseBinary("1.0.0-defaultseries-amd64")
         v100p64 = version.MustParseBinary("1.0.0-precise-amd64")
         v100q32 = version.MustParseBinary("1.0.0-quantal-i386")
         v100q64 = version.MustParseBinary("1.0.0-quantal-amd64")
+        v120d64 = version.MustParseBinary("1.2.0-defaultseries-amd64")
+        v120p64 = version.MustParseBinary("1.2.0-precise-amd64")
+        v120q32 = version.MustParseBinary("1.2.0-quantal-i386")
+        v120q64 = version.MustParseBinary("1.2.0-quantal-amd64")
         v190p32 = version.MustParseBinary("1.9.0-precise-i386")
         v190q64 = version.MustParseBinary("1.9.0-quantal-amd64")
         v200p64 = version.MustParseBinary("2.0.0-precise-amd64")
         v100All = []version.Binary{
                 v100d64, v100p64, v100q64, v100q32,
         }
+        v120All = []version.Binary{
+                v120d64, v120p64, v120q64, v120q32,
+        }
         vAll = []version.Binary{
                 v100d64, v100p64, v100q32, v100q64,
+                v120d64, v120p64, v120q32, v120q64,
                 v190p32, v190q64,
                 v200p64,
         }
 )