← Back to branch summary

~bac/juju-core/add-config

« back to all changes in this revision

Viewing changes to state/state_test.go

  • Committer: Brad Crittenden
  • Date: 2013-02-19 13:00:57 UTC
  • mfrom: (903.1.5 juju-core)
  • Revision ID: bac@canonical.com-20130219130057-xdustugvge2w06vk
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/state_test.go
39
39
 
40
40
func (s *StateSuite) TestIsNotFound(c *C) {
41
41
        err1 := fmt.Errorf("unrelated error")
42
 
        err2 := &state.NotFoundError{}
 
42
        err2 := state.NotFoundf("foo")
43
43
        c.Assert(state.IsNotFound(err1), Equals, false)
44
44
        c.Assert(state.IsNotFound(err2), Equals, true)
45
45
}
130
130
        m, err := s.State.InjectMachine(state.InstanceId("i-mindustrious"), state.JobHostUnits, state.JobManageEnviron)
131
131
        c.Assert(err, IsNil)
132
132
        c.Assert(m.Jobs(), DeepEquals, []state.MachineJob{state.JobHostUnits, state.JobManageEnviron})
133
 
        instanceId, err := m.InstanceId()
134
 
        c.Assert(err, IsNil)
 
133
        instanceId, ok := m.InstanceId()
 
134
        c.Assert(ok, Equals, true)
135
135
        c.Assert(instanceId, Equals, state.InstanceId("i-mindustrious"))
136
136
}
137
137
 
166
166
        ms, _ := s.State.AllMachines()
167
167
        for i, m := range ms {
168
168
                c.Assert(m.Id(), Equals, strconv.Itoa(i))
169
 
                instId, err := m.InstanceId()
170
 
                c.Assert(err, IsNil)
 
169
                instId, ok := m.InstanceId()
 
170
                c.Assert(ok, Equals, true)
171
171
                c.Assert(string(instId), Equals, fmt.Sprintf("foo-%d", i))
172
172
                tools, err := m.AgentTools()
173
173
                c.Check(err, IsNil)