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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/juju/commands/resolved_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:
11
11
        "github.com/juju/juju/cmd/juju/service"
12
12
        jujutesting "github.com/juju/juju/juju/testing"
13
13
        "github.com/juju/juju/state"
 
14
        "github.com/juju/juju/status"
14
15
        "github.com/juju/juju/testcharms"
15
16
        "github.com/juju/juju/testing"
16
17
)
95
96
        for _, name := range []string{"dummy/2", "dummy/3", "dummy/4"} {
96
97
                u, err := s.State.Unit(name)
97
98
                c.Assert(err, jc.ErrorIsNil)
98
 
                err = u.SetAgentStatus(state.StatusError, "lol borken", nil)
 
99
                err = u.SetAgentStatus(status.StatusError, "lol borken", nil)
99
100
                c.Assert(err, jc.ErrorIsNil)
100
101
        }
101
102
 
123
124
        for _, name := range []string{"dummy/2", "dummy/3", "dummy/4"} {
124
125
                u, err := s.State.Unit(name)
125
126
                c.Assert(err, jc.ErrorIsNil)
126
 
                err = u.SetAgentStatus(state.StatusError, "lol borken", nil)
 
127
                err = u.SetAgentStatus(status.StatusError, "lol borken", nil)
127
128
                c.Assert(err, jc.ErrorIsNil)
128
129
        }
129
130