state: machines now have Jobs not Workers

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/juju/testing"
         "launchpad.net/juju-core/state"
@@ skipping 99 matching lines @@
                 code := cmd.Main(&SSHCommand{}, ctx, t.args)
                 c.Check(code, Equals, 0)
                 c.Check(ctx.Stderr.(*bytes.Buffer).String(), Equals, "")
                 c.Check(ctx.Stdout.(*bytes.Buffer).String(), Equals, t.result)
         }
 }
 
 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(state.MachinerWorker)
+                m, err := s.State.AddMachine(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(), testing.InvalidStateInfo(m.Id()), nil)
                 c.Assert(err, IsNil)
                 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, err := m.InstanceId()
         c.Assert(err, IsNil)
         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)
 }