← Back to branch summary

~rogpeppe/juju-core/387-use-testing-set

« back to all changes in this revision

Viewing changes to cmd/juju/upgradejuju_test.go

  • Committer: Ian Booth
  • Date: 2013-08-21 05:38:38 UTC
  • mto: (1603.8.2 simplify-tools-search)
  • mto: This revision was merged to the branch mainline in revision 1702.
  • Revision ID: ian.booth@canonical.com-20130821053838-3c9oahds4mg2u0l7
Pull out Tools struct to its own package

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/juju/upgradejuju_test.go
8
8
 
9
9
        gc "launchpad.net/gocheck"
10
10
 
11
 
        agenttools "launchpad.net/juju-core/agent/tools"
12
11
        "launchpad.net/juju-core/environs"
13
12
        envtesting "launchpad.net/juju-core/environs/testing"
14
 
        "launchpad.net/juju-core/environs/tools"
 
13
        envtools "launchpad.net/juju-core/environs/tools"
15
14
        "launchpad.net/juju-core/juju/testing"
16
15
        coretesting "launchpad.net/juju-core/testing"
 
16
        "launchpad.net/juju-core/tools"
17
17
        "launchpad.net/juju-core/version"
18
18
)
19
19
 
284
284
// consuming build from source.
285
285
// TODO(fwereade) better factor agent/tools such that build logic is
286
286
// exposed and can itself be neatly mocked?
287
 
func mockUploadTools(storage environs.Storage, forceVersion *version.Number, series ...string) (*agenttools.Tools, error) {
 
287
func mockUploadTools(storage environs.Storage, forceVersion *version.Number, series ...string) (*tools.Tools, error) {
288
288
        vers := version.Current
289
289
        if forceVersion != nil {
290
290
                vers.Number = *forceVersion
304
304
        uploadTools = mockUploadTools
305
305
        defer func() {
306
306
                version.Current = oldVersion
307
 
                uploadTools = tools.Upload
 
307
                uploadTools = envtools.Upload
308
308
        }()
309
309
 
310
310
        for i, test := range upgradeJujuTests {
360
360
 
361
361
                for _, uploaded := range test.expectUploaded {
362
362
                        vers := version.MustParseBinary(uploaded)
363
 
                        r, err := s.Conn.Environ.Storage().Get(tools.StorageName(vers))
 
363
                        r, err := s.Conn.Environ.Storage().Get(envtools.StorageName(vers))
364
364
                        if !c.Check(err, gc.IsNil) {
365
365
                                continue
366
366
                        }
397
397
        c.Assert(err, gc.IsNil)
398
398
        vers := version.Current
399
399
        vers.Build = 1
400
 
        name := tools.StorageName(vers)
 
400
        name := envtools.StorageName(vers)
401
401
        r, err := s.Conn.Environ.Storage().Get(name)
402
402
        c.Assert(err, gc.IsNil)
403
403
        r.Close()