← 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/agent/identity_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/agent/identity_test.go
15
15
 
16
16
        "github.com/juju/juju/apiserver/params"
17
17
        "github.com/juju/juju/testing"
18
 
        "github.com/juju/juju/version"
 
18
        jujuversion "github.com/juju/juju/version"
19
19
)
20
20
 
21
21
type identitySuite struct {
28
28
 
29
29
var attributeParams = AgentConfigParams{
30
30
        Tag:               names.NewMachineTag("1"),
31
 
        UpgradedToVersion: version.Current,
 
31
        UpgradedToVersion: jujuversion.Current,
32
32
        Password:          "sekrit",
33
33
        CACert:            "ca cert",
34
34
        StateAddresses:    []string{"localhost:1234"},