← 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/environs/tools/testing/testing.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/environs/tools/testing/testing.go
21
21
        "github.com/juju/utils/arch"
22
22
        "github.com/juju/utils/series"
23
23
        "github.com/juju/utils/set"
 
24
        "github.com/juju/version"
24
25
        gc "gopkg.in/check.v1"
25
26
 
26
27
        "github.com/juju/juju/environs/filestorage"
33
34
        "github.com/juju/juju/juju/names"
34
35
        coretesting "github.com/juju/juju/testing"
35
36
        coretools "github.com/juju/juju/tools"
36
 
        "github.com/juju/juju/version"
 
37
        jujuversion "github.com/juju/juju/version"
37
38
)
38
39
 
39
40
func GetMockBundleTools(c *gc.C) tools.BundleToolsFunc {
40
41
        return func(w io.Writer, forceVersion *version.Number) (version.Binary, string, error) {
41
42
                vers := version.Binary{
42
 
                        Number: version.Current,
 
43
                        Number: jujuversion.Current,
43
44
                        Arch:   arch.HostArch(),
44
45
                        Series: series.HostSeries(),
45
46
                }
56
57
func GetMockBuildTools(c *gc.C) sync.BuildToolsTarballFunc {
57
58
        return func(forceVersion *version.Number, stream string) (*sync.BuiltTools, error) {
58
59
                vers := version.Binary{
59
 
                        Number: version.Current,
 
60
                        Number: jujuversion.Current,
60
61
                        Arch:   arch.HostArch(),
61
62
                        Series: series.HostSeries(),
62
63
                }