~go-bot/juju-core/trunk

« back to all changes in this revision

Viewing changes to state/apiserver/machine/machiner_test.go

  • Committer: Tarmac
  • Author(s): Frank Mueller
  • Date: 2013-09-27 15:54:12 UTC
  • mfrom: (1880.1.8 juju-core)
  • Revision ID: tarmac-20130927155412-7jg4vd1xuikq4umy
[r=themue],[bug=1224568] uniter: add hook error status data

With this CL information about a failing hook and,
if possible, the relation id and the remote unit are
written into the status data of the status doc.

https://codereview.appspot.com/14030043/

Show diffs side-by-side

added added

removed removed

Lines of Context:
72
72
        })
73
73
 
74
74
        // Verify machine 0 - no change.
75
 
        status, info, err := s.machine0.Status()
 
75
        status, info, _, err := s.machine0.Status()
76
76
        c.Assert(err, gc.IsNil)
77
77
        c.Assert(status, gc.Equals, params.StatusStarted)
78
78
        c.Assert(info, gc.Equals, "blah")
79
79
        // ...machine 1 is fine though.
80
 
        status, info, err = s.machine1.Status()
 
80
        status, info, _, err = s.machine1.Status()
81
81
        c.Assert(err, gc.IsNil)
82
82
        c.Assert(status, gc.Equals, params.StatusError)
83
83
        c.Assert(info, gc.Equals, "not really")