cmd/juju: add --upload-tools flag to bootstrap command

environs/ec2/live_test.go

 package ec2_test
 
 import (
         "crypto/rand"
         "fmt"
         "io"
         amzec2 "launchpad.net/goamz/ec2"
-        "launchpad.net/goamz/s3"
         . "launchpad.net/gocheck"
         "launchpad.net/juju/go/environs"
         "launchpad.net/juju/go/environs/ec2"
         "launchpad.net/juju/go/environs/jujutest"
         "launchpad.net/juju/go/testing"
         "strings"
         "time"
 )
 
 // amazonConfig holds the environments configuration
@@ skipping 172 matching lines @@
                 case inst1.Id():
                         c.Assert(hasSecurityGroup(r, groups[2]), Equals, true, msg)
                         c.Assert(hasSecurityGroup(r, groups[1]), Equals, false, msg)
                 default:
                         c.Errorf("unknown instance found: %v", inst)
                 }
         }
 }
 
 func (t *LiveTests) TestDestroy(c *C) {
-        err := t.Env.PutFile("foo", strings.NewReader("foo"), 3)
-        c.Assert(err, IsNil)
-        err = t.Env.PutFile("bar", strings.NewReader("bar"), 3)
+        s := t.Env.Storage()
+        err := s.Put("foo", strings.NewReader("foo"), 3)
+        c.Assert(err, IsNil)
+        err = s.Put("bar", strings.NewReader("bar"), 3)
         c.Assert(err, IsNil)
 
         // Check that bucket exists, so we can be sure
         // we have checked correctly that it's been destroyed.
-        b := ec2.EnvironBucket(t.Env)
-        resp, err := b.List("", "", "", 0)
-        c.Assert(err, IsNil)
-        c.Assert(len(resp.Contents) >= 2, Equals, true)
+        names, err := s.List("")
+        c.Assert(err, IsNil)
+        c.Assert(len(names) >= 2, Equals, true)
 
         t.Destroy(c)
 
-        resp, err = b.List("", "", "", 0)
-        c.Assert(err, NotNil)
-        c.Assert(err.(*s3.Error).StatusCode, Equals, 404)
+        names, err = s.List("")
+        var notFoundError *environs.NotFoundError
+        c.Assert(err, FitsTypeOf, notFoundError)
 }
 
 func checkPortAllowed(c *C, perms []amzec2.IPPerm, port int) {
         for _, perm := range perms {
                 if perm.FromPort == port {
                         c.Check(perm.Protocol, Equals, "tcp")
                         c.Check(perm.ToPort, Equals, port)
                         c.Check(perm.SourceIPs, DeepEquals, []string{"0.0.0.0/0"})
                         c.Check(perm.SourceGroups, HasLen, 0)
                         return
@@ skipping 63 matching lines @@
 }
 
 func hasSecurityGroup(r amzec2.Reservation, g amzec2.SecurityGroup) bool {
         for _, rg := range r.SecurityGroups {
                 if rg.Id == g.Id {
                         return true
                 }
         }
         return false
 }