state: deprecate JobManageState

state/assign_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package state_test
 
 import (
         "fmt"
         "sort"
         "strconv"
         "time"
@@ skipping 773 matching lines @@
         c.Assert(m, gc.IsNil)
         c.Assert(err, gc.ErrorMatches, eligibleMachinesInUse)
 
         // Add a non-unit-hosting machine and check it is not chosen.
         m, err = s.State.AddMachine("quantal", state.JobManageEnviron)
         c.Assert(err, gc.IsNil)
         m, err = s.assignUnit(unit)
         c.Assert(m, gc.IsNil)
         c.Assert(err, gc.ErrorMatches, eligibleMachinesInUse)
 
-        // Add a state management machine which can host units and check it is not chosen.

[dimitern, 2014/01/24 13:31:38]

Why remove this, rather than just change JobManageState to JobManageEnviron and
the comment?

[rog, 2014/01/24 13:34:42]

Because it would then be exactly the same as the following test.

-        m, err = s.State.AddMachine("quantal", state.JobManageState, state.JobHostUnits)
-        c.Assert(err, gc.IsNil)
-        m, err = s.assignUnit(unit)
-        c.Assert(m, gc.IsNil)
-        c.Assert(err, gc.ErrorMatches, eligibleMachinesInUse)
-
         // Add a environ management machine which can host units and check it is not chosen.
         m, err = s.State.AddMachine("quantal", state.JobManageEnviron, state.JobHostUnits)
         c.Assert(err, gc.IsNil)
         m, err = s.assignUnit(unit)
         c.Assert(m, gc.IsNil)
         c.Assert(err, gc.ErrorMatches, eligibleMachinesInUse)
 
         // Add a machine with the wrong series and check it is not chosen.
         m, err = s.State.AddMachine("anotherseries", state.JobHostUnits)
         c.Assert(err, gc.IsNil)
@@ skipping 346 matching lines @@
                 c.Assert(err, gc.IsNil)
                 assignments[id] = append(assignments[id], r.u)
         }
         for id, us := range assignments {
                 if len(us) != 1 {
                         c.Errorf("machine %s expected one unit, got %q", id, us)
                 }
         }
         c.Assert(assignments, gc.HasLen, len(us))
 }