← Back to branch summary

~fwereade/pyjuju/go-place-unit

« back to all changes in this revision

Viewing changes to state/state_test.go

  • Committer: William Reade
  • Date: 2012-06-06 10:17:40 UTC
  • Revision ID: fwereade@gmail.com-20120606101740-a6xgj009s8tqt7v1
address review points

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/state_test.go
804
804
        c.Assert(err, ErrorMatches, "no unused machine found")
805
805
}
806
806
 
807
 
func (s *StateSuite) TestPlaceUnit(c *C) {
 
807
func (s *StateSuite) TestAssignUnit(c *C) {
808
808
        _, err := s.st.AddMachine()
809
809
        c.Assert(err, IsNil)
810
810
        dummy := s.addDummyCharm(c)
814
814
        c.Assert(err, IsNil)
815
815
 
816
816
        // Check nonsensical policy
817
 
        fail := func() { unit0.Place(state.PlacementPolicy("random")) }
818
 
        c.Assert(fail, PanicMatches, `unknown unit placement policy: "random"`)
 
817
        fail := func() { state.AssignUnit(s.st, unit0, state.AssignmentPolicy("random")) }
 
818
        c.Assert(fail, PanicMatches, `unknown unit assignment policy: "random"`)
819
819
        _, err = unit0.AssignedMachineId()
820
820
        c.Assert(err, NotNil)
821
821
        s.assertMachineCount(c, 1)
822
822
 
823
823
        // Check local placement
824
 
        err = unit0.Place(state.PlaceLocal)
 
824
        err = state.AssignUnit(s.st, unit0, state.AssignLocal)
825
825
        c.Assert(err, IsNil)
826
826
        mid, err := unit0.AssignedMachineId()
827
827
        c.Assert(err, IsNil)
831
831
        // Check unassigned placement with no unused machines
832
832
        unit1, err := serv.AddUnit()
833
833
        c.Assert(err, IsNil)
834
 
        err = unit1.Place(state.PlaceUnassigned)
 
834
        err = state.AssignUnit(s.st, unit1, state.AssignUnused)
835
835
        c.Assert(err, IsNil)
836
836
        mid, err = unit1.AssignedMachineId()
837
837
        c.Assert(err, IsNil)
842
842
        _, err = s.st.AddMachine()
843
843
        unit2, err := serv.AddUnit()
844
844
        c.Assert(err, IsNil)
845
 
        err = unit2.Place(state.PlaceUnassigned)
 
845
        err = state.AssignUnit(s.st, unit2, state.AssignUnused)
846
846
        c.Assert(err, IsNil)
847
847
        mid, err = unit2.AssignedMachineId()
848
848
        c.Assert(err, IsNil)