~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/synctools_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:
15
15
        "github.com/juju/utils"
16
16
        "github.com/juju/utils/arch"
17
17
        "github.com/juju/utils/series"
 
18
        "github.com/juju/version"
18
19
        gc "gopkg.in/check.v1"
19
20
 
20
21
        "github.com/juju/juju/apiserver/common"
26
27
        "github.com/juju/juju/jujuclient/jujuclienttesting"
27
28
        coretesting "github.com/juju/juju/testing"
28
29
        coretools "github.com/juju/juju/tools"
29
 
        "github.com/juju/juju/version"
 
30
        jujuversion "github.com/juju/juju/version"
30
31
)
31
32
 
32
33
type syncToolsSuite struct {
262
263
func (s *syncToolsSuite) TestAPIAdapterUploadTools(c *gc.C) {
263
264
        uploadToolsErr := errors.New("uh oh")
264
265
        current := version.Binary{
265
 
                Number: version.Current,
 
266
                Number: jujuversion.Current,
266
267
                Arch:   arch.HostArch(),
267
268
                Series: series.HostSeries(),
268
269
        }