environs: upload juju tools to cloud.

cmd/juju/cmd_test.go

 package main_test
 
 import (
         "io/ioutil"
         "launchpad.net/gnuflag"
         . "launchpad.net/gocheck"
         "launchpad.net/juju/go/cmd"
         main "launchpad.net/juju/go/cmd/juju"
         "launchpad.net/juju/go/environs"
         "launchpad.net/juju/go/environs/dummy"
@@ skipping 118 matching lines @@
                         return
                 }
 
                 err = com.Run(cmd.DefaultContext())
                 errc <- err
         }()
         return
 }
 
 func (*cmdSuite) TestBootstrapCommand(c *C) {
+        defer dummy.Reset()

[niemeyer, 2012/05/21 21:29:10]

Why is this necessary, considering that TearDownTest is doing it too?

[rog, 2012/05/22 09:00:58]

Done.

+
         // normal bootstrap
         opc, errc := runCommand(new(main.BootstrapCommand))
         c.Check(<-opc, Equals, op(dummy.OpBootstrap, "peckham"))
         c.Check(<-errc, IsNil)
 
         // bootstrap with tool uploading - checking that a file
         // is uploaded should be sufficient, as the detailed semantics
         // of UploadTools are tested in environs.
         opc, errc = runCommand(new(main.BootstrapCommand), "--upload-tools")
         c.Check(<-opc, Equals, op(dummy.OpPutFile, "peckham"))
         c.Check(<-opc, Equals, op(dummy.OpBootstrap, "peckham"))
         c.Check(<-errc, IsNil)
 
         envs, err := environs.ReadEnvirons("")
         c.Assert(err, IsNil)
         env, err := envs.Open("peckham")
         c.Assert(err, IsNil)
         dir := c.MkDir()
-        err = environs.GetTools(env.Storage(), dir)
+        err = environs.GetTools(env, dir)
         c.Assert(err, IsNil)
 
         // bootstrap with broken environment
         opc, errc = runCommand(new(main.BootstrapCommand), "-e", "barking")
         c.Check((<-opc).Kind, Equals, dummy.OpNone)
         c.Check(<-errc, ErrorMatches, `broken environment`)
 }
 
 func (*cmdSuite) TestDestroyCommand(c *C) {
         // normal destroy
         opc, errc := runCommand(new(main.DestroyCommand))
         c.Check(<-opc, Equals, op(dummy.OpDestroy, "peckham"))
         c.Check(<-errc, IsNil)
 
         // destroy with broken environment
         opc, errc = runCommand(new(main.DestroyCommand), "-e", "barking")
         c.Check((<-opc).Kind, Equals, dummy.OpNone)
         c.Check(<-errc, ErrorMatches, `broken environment`)
 }
 
 func op(kind dummy.OperationKind, name string) dummy.Operation {
         return dummy.Operation{
                 Env:  name,
                 Kind: kind,
         }
 }