← Back to branch summary

~jameinel/juju-core/api-registry-tracks-type

« back to all changes in this revision

Viewing changes to state/assign_test.go

Merged local-sudo-caller into local-provider-bootstrap.

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/assign_test.go
5
5
 
6
6
import (
7
7
        "fmt"
 
8
        "sort"
 
9
        "strconv"
 
10
        "time"
 
11
 
8
12
        . "launchpad.net/gocheck"
 
13
 
9
14
        "launchpad.net/juju-core/constraints"
10
15
        "launchpad.net/juju-core/instance"
11
16
        "launchpad.net/juju-core/state"
12
 
        . "launchpad.net/juju-core/testing/checkers"
13
 
        "sort"
14
 
        "strconv"
15
 
        "time"
 
17
        jc "launchpad.net/juju-core/testing/checkers"
16
18
)
17
19
 
18
20
type AssignSuite struct {
191
193
                c.Assert(err, IsNil)
192
194
                name, ok := u.DeployerTag()
193
195
                if d == nil {
194
 
                        c.Assert(ok, IsFalse)
 
196
                        c.Assert(ok, jc.IsFalse)
195
197
                } else {
196
 
                        c.Assert(ok, IsTrue)
 
198
                        c.Assert(ok, jc.IsTrue)
197
199
                        c.Assert(name, Equals, d.Tag())
198
200
                }
199
201
        }
371
373
        c.Assert(err, IsNil)
372
374
        machine, err := s.State.Machine(mid)
373
375
        c.Assert(err, IsNil)
374
 
        c.Assert(machine.Clean(), IsFalse)
 
376
        c.Assert(machine.Clean(), jc.IsFalse)
375
377
}
376
378
 
377
379
func (s *AssignSuite) TestAssignUnitToNewMachineSetsConstraints(c *C) {
646
648
                Jobs:          []state.MachineJob{state.JobHostUnits},
647
649
        }
648
650
        container, err = s.State.AddMachineWithConstraints(&params)
649
 
        c.Assert(hostMachine.Clean(), IsTrue)
 
651
        c.Assert(hostMachine.Clean(), jc.IsTrue)
650
652
        s.assertMachineNotEmpty(c, hostMachine)
651
653
 
652
654
        // Create a new, clean, empty machine.
653
655
        cleanEmptyMachine, err = s.State.AddMachine("series", state.JobHostUnits)
654
656
        c.Assert(err, IsNil)
655
 
        c.Assert(cleanEmptyMachine.Clean(), IsTrue)
 
657
        c.Assert(cleanEmptyMachine.Clean(), jc.IsTrue)
656
658
        s.assertMachineEmpty(c, cleanEmptyMachine)
657
659
        return hostMachine, container, cleanEmptyMachine
658
660
}
663
665
        reusedMachine, err := s.assignUnit(unit)
664
666
        c.Assert(err, IsNil)
665
667
        c.Assert(reusedMachine.Id(), Equals, expectedMachine.Id())
666
 
        c.Assert(reusedMachine.Clean(), IsFalse)
 
668
        c.Assert(reusedMachine.Clean(), jc.IsFalse)
667
669
}
668
670
 
669
671
func (s *assignCleanSuite) TestAssignUnit(c *C) {
826
828
                Jobs:          []state.MachineJob{state.JobHostUnits},
827
829
        }
828
830
        container, err := s.State.AddMachineWithConstraints(&params)
829
 
        c.Assert(hostMachine.Clean(), IsTrue)
 
831
        c.Assert(hostMachine.Clean(), jc.IsTrue)
830
832
        s.assertMachineNotEmpty(c, hostMachine)
831
833
        if s.policy == state.AssignClean {
832
834
                expectedMachines = append(expectedMachines, hostMachine.Id())