state: use string IDs for machines

juju/testing/conn.go

 package testing
 
 import (
         "fmt"
         "io/ioutil"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/dummy"
         "launchpad.net/juju-core/juju"
@@ skipping 22 matching lines @@
         testing.MgoSuite
         Conn    *juju.Conn
         State   *state.State
         RootDir string // The faked-up root directory.
         oldHome string
 }
 
 // InvalidStateInfo holds information about no state - it will always
 // give an error when connected to.  The machine id gives the machine id
 // of the machine to be started
-func InvalidStateInfo(machineId int) *state.Info {
+func InvalidStateInfo(machineId string) *state.Info {
         return &state.Info{
                 Addrs:      []string{"0.1.2.3:1234"},
                 EntityName: state.MachineEntityName(machineId),
                 Password:   "unimportant",
                 CACert:     []byte(testing.CACert),
         }
 }
 
 const AdminSecret = "dummy-secret"
 
@@ skipping 128 matching lines @@
 func (s *JujuConnSuite) AddTestingCharm(c *C, name string) *state.Charm {
         ch := testing.Charms.Dir("series", name)
         ident := fmt.Sprintf("%s-%d", ch.Meta().Name, ch.Revision())
         curl := charm.MustParseURL("local:series/" + ident)
         repo, err := charm.InferRepository(curl, testing.Charms.Path)
         c.Assert(err, IsNil)
         sch, err := s.Conn.PutCharm(curl, repo, false)
         c.Assert(err, IsNil)
         return sch
 }