← 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/apiserver/upgrader/upgrader_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/apiserver/upgrader/upgrader_test.go
11
11
        jc "github.com/juju/testing/checkers"
12
12
        "github.com/juju/utils/arch"
13
13
        "github.com/juju/utils/series"
 
14
        "github.com/juju/version"
14
15
        gc "gopkg.in/check.v1"
15
16
 
16
17
        "github.com/juju/juju/apiserver/common"
21
22
        "github.com/juju/juju/state"
22
23
        statetesting "github.com/juju/juju/state/testing"
23
24
        coretesting "github.com/juju/juju/testing"
24
 
        "github.com/juju/juju/version"
 
25
        jujuversion "github.com/juju/juju/version"
25
26
)
26
27
 
27
28
type upgraderSuite struct {
149
150
 
150
151
func (s *upgraderSuite) TestToolsForAgent(c *gc.C) {
151
152
        current := version.Binary{
152
 
                Number: version.Current,
 
153
                Number: jujuversion.Current,
153
154
                Arch:   arch.HostArch(),
154
155
                Series: series.HostSeries(),
155
156
        }
193
194
                        Tag: s.rawMachine.Tag().String(),
194
195
                        Tools: &params.Version{
195
196
                                Version: version.Binary{
196
 
                                        Number: version.Current,
 
197
                                        Number: jujuversion.Current,
197
198
                                        Arch:   arch.HostArch(),
198
199
                                        Series: series.HostSeries(),
199
200
                                },
208
209
 
209
210
func (s *upgraderSuite) TestSetTools(c *gc.C) {
210
211
        current := version.Binary{
211
 
                Number: version.Current,
 
212
                Number: jujuversion.Current,
212
213
                Arch:   arch.HostArch(),
213
214
                Series: series.HostSeries(),
214
215
        }
270
271
        c.Assert(results.Results[0].Error, gc.IsNil)
271
272
        agentVersion := results.Results[0].Version
272
273
        c.Assert(agentVersion, gc.NotNil)
273
 
        c.Check(*agentVersion, gc.DeepEquals, version.Current)
 
274
        c.Check(*agentVersion, gc.DeepEquals, jujuversion.Current)
274
275
 
275
276
        c.Assert(results.Results[1].Error, gc.DeepEquals, apiservertesting.ErrUnauthorized)
276
277
        c.Assert(results.Results[1].Version, gc.IsNil)
285
286
        c.Assert(results.Results[0].Error, gc.IsNil)
286
287
        agentVersion := results.Results[0].Version
287
288
        c.Assert(agentVersion, gc.NotNil)
288
 
        c.Check(*agentVersion, gc.DeepEquals, version.Current)
 
289
        c.Check(*agentVersion, gc.DeepEquals, jujuversion.Current)
289
290
}
290
291
 
291
292
func (s *upgraderSuite) bumpDesiredAgentVersion(c *gc.C) version.Number {
292
293
        // In order to call SetModelAgentVersion we have to first SetTools on
293
294
        // all the existing machines
294
295
        current := version.Binary{
295
 
                Number: version.Current,
 
296
                Number: jujuversion.Current,
296
297
                Arch:   arch.HostArch(),
297
298
                Series: series.HostSeries(),
298
299
        }
330
331
 
331
332
func (s *upgraderSuite) TestDesiredVersionRestrictedForNonAPIAgents(c *gc.C) {
332
333
        newVersion := s.bumpDesiredAgentVersion(c)
333
 
        c.Assert(newVersion, gc.Not(gc.Equals), version.Current)
 
334
        c.Assert(newVersion, gc.Not(gc.Equals), jujuversion.Current)
334
335
        args := params.Entities{Entities: []params.Entity{{Tag: s.rawMachine.Tag().String()}}}
335
336
        results, err := s.upgrader.DesiredVersion(args)
336
337
        c.Assert(err, jc.ErrorIsNil)
338
339
        c.Assert(results.Results[0].Error, gc.IsNil)
339
340
        agentVersion := results.Results[0].Version
340
341
        c.Assert(agentVersion, gc.NotNil)
341
 
        c.Check(*agentVersion, gc.DeepEquals, version.Current)
 
342
        c.Check(*agentVersion, gc.DeepEquals, jujuversion.Current)
342
343
}