state/api/params: add CharmURL to ServiceInfo

cmd/juju/ssh_test.go

 package main
 
 import (
         "bytes"
         "fmt"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/cmd"
-        "launchpad.net/juju-core/constraints"
         "launchpad.net/juju-core/juju/testing"
         "launchpad.net/juju-core/state"
         coretesting "launchpad.net/juju-core/testing"
         "net/url"
         "os"
         "path/filepath"
 )
 
 var _ = Suite(&SSHSuite{})
 
@@ skipping 95 matching lines @@
         }
 }
 
 func (s *SSHCommonSuite) makeMachines(n int, c *C) []*state.Machine {
         var machines = make([]*state.Machine, n)
         for i := 0; i < n; i++ {
                 m, err := s.State.AddMachine("series", state.JobHostUnits)
                 c.Assert(err, IsNil)
                 // must set an instance id as the ssh command uses that as a signal the machine
                 // has been provisioned
-                inst, err := s.Conn.Environ.StartInstance(m.Id(), constraints.Value{}, testing.InvalidStateInfo(m.Id()), testing.InvalidAPIInfo(m.Id()), nil)
-                c.Assert(err, IsNil)
+                inst := testing.StartInstance(c, s.Conn.Environ, m.Id())
                 c.Assert(m.SetInstanceId(inst.Id()), IsNil)
                 machines[i] = m
         }
         return machines
 }
 
 func (s *SSHCommonSuite) addUnit(srv *state.Service, m *state.Machine, c *C) {
         u, err := srv.AddUnit()
         c.Assert(err, IsNil)
         err = u.AssignToMachine(m)
         c.Assert(err, IsNil)
         // fudge unit.SetPublicAddress
         id, ok := m.InstanceId()
         c.Assert(ok, Equals, true)
         insts, err := s.Conn.Environ.Instances([]state.InstanceId{id})
         c.Assert(err, IsNil)
         addr, err := insts[0].WaitDNSName()
         c.Assert(err, IsNil)
         err = u.SetPublicAddress(addr)
         c.Assert(err, IsNil)
 }