environs/jujutest: use AttemptStrategy

environs/ec2/export_test.go

 package ec2
 
 import (
         "launchpad.net/goamz/ec2"
         "launchpad.net/goamz/s3"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/trivial"
         "net/http"
 )
 
 type BootstrapState struct {
         StateInstances []string
 }
 
 func LoadState(e environs.Environ) (*BootstrapState, error) {
         s, err := e.(*environ).loadState()
         if err != nil {
                 return nil, err
         }
         return &BootstrapState{s.StateInstances}, nil
 }
 
-func GroupName(e environs.Environ) string {
-        return e.(*environ).groupName()
+func JujuGroupName(e environs.Environ) string {
+        return e.(*environ).jujuGroupName()
 }
 
 func MachineGroupName(e environs.Environ, machineId int) string {
         return e.(*environ).machineGroupName(machineId)
 }
 
 func EnvironEC2(e environs.Environ) *ec2.EC2 {
         return e.(*environ).ec2()
 }
 
@@ skipping 71 matching lines @@
 
 // FabricateInstance creates a new fictitious instance
 // given an existing instance and a new id.
 func FabricateInstance(inst environs.Instance, newId string) environs.Instance {
         oldi := inst.(*instance)
         newi := &instance{oldi.e, &ec2.Instance{}}
         *newi.Instance = *oldi.Instance
         newi.InstanceId = newId
         return newi
 }