state: Machine.InstanceId returns bool

state/api/api_test.go

 package api_test
 
 import (
         "fmt"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/juju/testing"
         "launchpad.net/juju-core/rpc"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/state/api"
         coretesting "launchpad.net/juju-core/testing"
@@ skipping 120 matching lines @@
                         setDefaultPassword(c, u)
                 }, nil
         }
 }
 
 func opGetMachine1(c *C, st *api.State) (func(), error) {
         m, err := st.Machine("1")
         if err != nil {
                 c.Check(m, IsNil)
         } else {
-                name, err := m.InstanceId()
-                c.Assert(err, IsNil)
+                name, ok := m.InstanceId()
+                c.Assert(ok, Equals, true)
                 c.Assert(name, Equals, "i-machine-1")
         }
         return func() {}, err
 }
 
 func opMachine1SetPassword(c *C, st *api.State) (func(), error) {
         m, err := st.Machine("1")
         if err != nil {
                 c.Check(m, IsNil)
                 return func() {}, err
@@ skipping 224 matching lines @@
         info.EntityName = stm.EntityName()
         info.Password = "machine-password"
 
         st, err := api.Open(info)
         c.Assert(err, IsNil)
         defer st.Close()
 
         m, err := st.Machine(stm.Id())
         c.Assert(err, IsNil)
 
-        instId, err := m.InstanceId()
-        c.Assert(err, IsNil)
+        instId, ok := m.InstanceId()
+        c.Assert(ok, Equals, true)
         c.Assert(instId, Equals, "i-foo")
 }
 
 func (s *suite) TestMachineInstanceId(c *C) {
         stm, err := s.State.AddMachine(state.JobHostUnits)
         c.Assert(err, IsNil)
         setDefaultPassword(c, stm)
 
         // Normal users can't access Machines...
         m, err := s.APIState.Machine(stm.Id())
         c.Assert(err, ErrorMatches, "permission denied")
         c.Assert(m, IsNil)
 
         // ... so login as the machine.
         st := s.openAs(c, stm.EntityName())
 
         m, err = st.Machine(stm.Id())
         c.Assert(err, IsNil)
 
-        instId, err := m.InstanceId()
+        instId, ok := m.InstanceId()
         c.Check(instId, Equals, "")
-        c.Check(err, ErrorMatches, "instance id for machine 0 not found")
+        c.Check(ok, Equals, false)
 
         err = stm.SetInstanceId("foo")
         c.Assert(err, IsNil)
 
-        instId, err = m.InstanceId()
+        instId, ok = m.InstanceId()
         c.Check(instId, Equals, "")
-        c.Check(err, ErrorMatches, "instance id for machine 0 not found")
+        c.Check(ok, Equals, false)
 
         err = m.Refresh()
         c.Assert(err, IsNil)
 
-        instId, err = m.InstanceId()
-        c.Assert(err, IsNil)
+        instId, ok = m.InstanceId()
+        c.Check(ok, Equals, true)
         c.Assert(instId, Equals, "foo")
 }
 
 func (s *suite) TestMachineRefresh(c *C) {
         stm, err := s.State.AddMachine(state.JobHostUnits)
         c.Assert(err, IsNil)
         setDefaultPassword(c, stm)
         err = stm.SetInstanceId("foo")
         c.Assert(err, IsNil)
 
         st := s.openAs(c, stm.EntityName())
         m, err := st.Machine(stm.Id())
         c.Assert(err, IsNil)
 
-        instId, err := m.InstanceId()
-        c.Assert(err, IsNil)
+        instId, ok := m.InstanceId()
+        c.Assert(ok, Equals, true)
         c.Assert(instId, Equals, "foo")
 
         err = stm.SetInstanceId("bar")
         c.Assert(err, IsNil)
 
-        instId, err = m.InstanceId()
-        c.Assert(err, IsNil)
+        instId, ok = m.InstanceId()
+        c.Assert(ok, Equals, true)
         c.Assert(instId, Equals, "foo")
 
         err = m.Refresh()
         c.Assert(err, IsNil)
 
-        instId, err = m.InstanceId()
-        c.Assert(err, IsNil)
+        instId, ok = m.InstanceId()
+        c.Assert(ok, Equals, true)
         c.Assert(instId, Equals, "bar")
 }
 
 func (s *suite) TestMachineSetPassword(c *C) {
         stm, err := s.State.AddMachine(state.JobHostUnits)
         c.Assert(err, IsNil)
         setDefaultPassword(c, stm)
 
         st := s.openAs(c, stm.EntityName())
         m, err := st.Machine(stm.Id())
@@ skipping 103 matching lines @@
         _, info, err := s.APIConn.Environ.StateInfo()
         c.Assert(err, IsNil)
         info.EntityName = entityName
         info.Password = fmt.Sprintf("%s password", entityName)
         c.Logf("opening state; entity %q; password %q", info.EntityName, info.Password)
         st, err := api.Open(info)
         c.Assert(err, IsNil)
         c.Assert(st, NotNil)
         return st
 }