state: machines now have Jobs not Workers

state/service_test.go

 package state_test
 
 import (
         "fmt"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/testing"
         "os"
         "path/filepath"
@@ skipping 238 matching lines @@
         c.Assert(err, IsNil)
         c.Assert(unitOne.Name(), Equals, "mysql/1")
         principal = unitOne.IsPrincipal()
         c.Assert(principal, Equals, true)
 
         // Check that principal units cannot be added to principal units.
         _, err = s.service.AddUnitSubordinateTo(unitZero)
         c.Assert(err, ErrorMatches, `cannot add unit to service "mysql" as a subordinate of "mysql/0": service is not a subordinate`)
 
         // Assign the principal unit to a machine.
-        m, err := s.State.AddMachine(state.HostPrincipalUnits)
+        m, err := s.State.AddMachine(state.JobHostUnits)
         c.Assert(err, IsNil)
         err = unitZero.AssignToMachine(m)
         c.Assert(err, IsNil)
 
         // Add a subordinate service.
         subCharm := s.AddTestingCharm(c, "logging")
         logging, err := s.State.AddService("logging", subCharm)
         c.Assert(err, IsNil)
 
         // Check that subordinate units can be added to principal units
@@ skipping 798 matching lines @@
         case <-time.After(500 * time.Millisecond):
                 c.Fatalf("did not get change")
         }
 
         select {
         case got := <-configWatcher.Changes():
                 c.Fatalf("got unexpected change: %#v", got)
         case <-time.After(100 * time.Millisecond):
         }
 }