state: Machine.InstanceId returns bool

state/api/api_test.go

 package api_test
 
 import (
         "fmt"
+        "io"
         . "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"
         "net"
         stdtesting "testing"
 )
 
@@ skipping 532 matching lines @@
 
         m, err := st.Machine(stm.Id())
         c.Assert(err, IsNil)
         c.Assert(m.Id(), Equals, stm.Id())
 
         err = srv.Stop()
         c.Assert(err, IsNil)
         c.Logf("srv stopped")
 
         _, err = st.Machine(stm.Id())
-        c.Assert(err, Equals, rpc.ErrShutdown)
+        // The client has not necessarily seen the server
+        // shutdown yet, so there are two possible
+        // errors.
+        if err != rpc.ErrShutdown && err != io.ErrUnexpectedEOF {
+                c.Fatalf("unexpected error from request: %v", err)
+        }
 
         // Check it can be stopped twice.
         err = srv.Stop()
         c.Assert(err, IsNil)
 }
 
 // openAs connects to the API state as the given entity
 // with the default password for that entity.
 func (s *suite) openAs(c *C, entityName string) *api.State {
         _, 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
 }