← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/worker/instancepoller/aggregate_test.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/worker/instancepoller/aggregate_test.go
16
16
        "github.com/juju/juju/environs"
17
17
        "github.com/juju/juju/instance"
18
18
        "github.com/juju/juju/network"
 
19
        "github.com/juju/juju/status"
19
20
        "github.com/juju/juju/testing"
20
21
)
21
22
 
46
47
        return t.addresses, nil
47
48
}
48
49
 
49
 
func (t *testInstance) Status() string {
50
 
        return t.status
 
50
func (t *testInstance) Status() instance.InstanceStatus {
 
51
        return instance.InstanceStatus{Status: status.StatusUnknown, Message: t.status}
51
52
}
52
53
 
53
54
type testInstanceGetter struct {
91
92
        info, err := aggregator.instanceInfo("foo")
92
93
        c.Assert(err, jc.ErrorIsNil)
93
94
        c.Assert(info, gc.DeepEquals, instanceInfo{
94
 
                status:    "foobar",
 
95
                status:    instance.InstanceStatus{Status: status.StatusUnknown, Message: "foobar"},
95
96
                addresses: instance1.addresses,
96
97
        })
97
98
        c.Assert(testGetter.ids, gc.DeepEquals, []instance.Id{"foo"})
120
121
        checkInfo := func(id instance.Id, expectStatus string) {
121
122
                info, err := aggregator.instanceInfo(id)
122
123
                c.Check(err, jc.ErrorIsNil)
123
 
                c.Check(info.status, gc.Equals, expectStatus)
 
124
                c.Check(info.status.Message, gc.Equals, expectStatus)
124
125
                wg.Done()
125
126
        }
126
127