Add machine instance metadata to state

cmd/jujud/machine_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package main
 
 import (
         "fmt"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/cmd"
@@ skipping 240 matching lines @@
         // Wait for the instance id to show up in the state.
         id1, err := units[0].AssignedMachineId()
         c.Assert(err, IsNil)
         m1, err := s.State.Machine(id1)
         c.Assert(err, IsNil)
         w := m1.Watch()
         defer w.Stop()
         for _ = range w.Changes() {
                 err = m1.Refresh()
                 c.Assert(err, IsNil)
-                if _, ok := m1.InstanceId(); ok {
+                if _, err := m1.InstanceId(); err == nil {
                         break
+                } else {
+                        c.Check(err, FitsTypeOf, (*state.NotProvisionedError)(nil))
                 }
         }
         err = units[0].OpenPort("tcp", 999)
         c.Assert(err, IsNil)
 
         c.Check(opRecvTimeout(c, s.State, op, dummy.OpOpenPorts{}), NotNil)
 
         err = a.Stop()
         c.Assert(err, IsNil)
 
@@ skipping 118 matching lines @@
                         c.Fatalf("time out wating for operation")
                 }
         }
         panic("not reached")
 }
 
 func (s *MachineSuite) TestOpenAPIState(c *C) {
         m, _, _ := s.primeAgent(c, state.JobHostUnits)
         s.testOpenAPIState(c, m, s.newAgent(c, m))
 }