environs/jujutest: use AttemptStrategy

environs/ec2/live_test.go

 package ec2_test
 
 import (
         "crypto/rand"
         "fmt"
         "io"
         "io/ioutil"
         amzec2 "launchpad.net/goamz/ec2"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/environs"
@@ skipping 214 matching lines @@
         }
 }
 
 func (t *LiveTests) TestDestroy(c *C) {
         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
+        // Check that the bucket exists, so we can be sure
         // we have checked correctly that it's been destroyed.
         names, err := s.List("")
         c.Assert(err, IsNil)
         c.Assert(len(names) >= 2, Equals, true)
 
         t.Destroy(c)
         for a := ec2.ShortAttempt.Start(); a.Next(); {
                 names, err = s.List("")
                 if len(names) == 0 {
                         break
@@ skipping 150 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
 }