← 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/cmd/jujud/agent/unit_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/cmd/jujud/agent/unit_test.go
16
16
        jc "github.com/juju/testing/checkers"
17
17
        "github.com/juju/utils/arch"
18
18
        "github.com/juju/utils/series"
 
19
        "github.com/juju/version"
19
20
        gc "gopkg.in/check.v1"
20
21
        "gopkg.in/natefinch/lumberjack.v2"
21
22
 
26
27
        jujutesting "github.com/juju/juju/juju/testing"
27
28
        "github.com/juju/juju/network"
28
29
        "github.com/juju/juju/state"
 
30
        "github.com/juju/juju/status"
29
31
        coretesting "github.com/juju/juju/testing"
30
32
        "github.com/juju/juju/tools"
31
 
        "github.com/juju/juju/version"
 
33
        jujuversion "github.com/juju/juju/version"
32
34
        "github.com/juju/juju/worker"
33
35
        "github.com/juju/juju/worker/apicaller"
34
36
        "github.com/juju/juju/worker/upgrader"
150
152
                        statusInfo, err := unit.Status()
151
153
                        c.Assert(err, jc.ErrorIsNil)
152
154
                        switch statusInfo.Status {
153
 
                        case state.StatusMaintenance, state.StatusWaiting, state.StatusBlocked:
 
155
                        case status.StatusMaintenance, status.StatusWaiting, status.StatusBlocked:
154
156
                                c.Logf("waiting...")
155
157
                                continue
156
 
                        case state.StatusActive:
 
158
                        case status.StatusActive:
157
159
                                c.Logf("active!")
158
160
                                return
159
 
                        case state.StatusUnknown:
 
161
                        case status.StatusUnknown:
160
162
                                // Active units may have a status of unknown if they have
161
163
                                // started but not run status-set.
162
164
                                c.Logf("unknown but active!")
167
169
                        statusInfo, err = unit.AgentStatus()
168
170
                        c.Assert(err, jc.ErrorIsNil)
169
171
                        switch statusInfo.Status {
170
 
                        case state.StatusAllocating, state.StatusExecuting, state.StatusRebooting, state.StatusIdle:
 
172
                        case status.StatusAllocating, status.StatusExecuting, status.StatusRebooting, status.StatusIdle:
171
173
                                c.Logf("waiting...")
172
174
                                continue
173
 
                        case state.StatusError:
 
175
                        case status.StatusError:
174
176
                                stateConn.StartSync()
175
177
                                c.Logf("unit is still down")
176
178
                        default:
192
194
        machine, unit, _, currentTools := s.primeAgent(c)
193
195
        agent := s.newAgent(c, unit)
194
196
        newVers := version.Binary{
195
 
                Number: version.Current,
 
197
                Number: jujuversion.Current,
196
198
                Arch:   arch.HostArch(),
197
199
                Series: series.HostSeries(),
198
200
        }
228
230
        machine, unit, _, _ := s.primeAgent(c)
229
231
        agent := s.newAgent(c, unit)
230
232
        newVers := version.Binary{
231
 
                Number: version.Current,
 
233
                Number: jujuversion.Current,
232
234
                Arch:   arch.HostArch(),
233
235
                Series: series.HostSeries(),
234
236
        }
334
336
func (s *UnitSuite) TestAgentSetsToolsVersion(c *gc.C) {
335
337
        _, unit, _, _ := s.primeAgent(c)
336
338
        vers := version.Binary{
337
 
                Number: version.Current,
 
339
                Number: jujuversion.Current,
338
340
                Arch:   arch.HostArch(),
339
341
                Series: series.HostSeries(),
340
342
        }
356
358
                        c.Assert(err, jc.ErrorIsNil)
357
359
                        agentTools, err := unit.AgentTools()
358
360
                        c.Assert(err, jc.ErrorIsNil)
359
 
                        if agentTools.Version.Minor != version.Current.Minor {
 
361
                        if agentTools.Version.Minor != jujuversion.Current.Minor {
360
362
                                continue
361
363
                        }
362
364
                        current := version.Binary{
363
 
                                Number: version.Current,
 
365
                                Number: jujuversion.Current,
364
366
                                Arch:   arch.HostArch(),
365
367
                                Series: series.HostSeries(),
366
368
                        }