← 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/state/backups/restore_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/state/backups/restore_test.go
29
29
        "github.com/juju/juju/state"
30
30
        statetesting "github.com/juju/juju/state/testing"
31
31
        coretesting "github.com/juju/juju/testing"
32
 
        "github.com/juju/juju/version"
 
32
        jujuversion "github.com/juju/juju/version"
33
33
)
34
34
 
35
35
var _ = gc.Suite(&RestoreSuite{})
207
207
                                DataDir: dataDir,
208
208
                                LogDir:  logDir,
209
209
                        },
210
 
                        UpgradedToVersion: version.Current,
 
210
                        UpgradedToVersion: jujuversion.Current,
211
211
                        Tag:               machineTag,
212
212
                        Model:             coretesting.ModelTag,
213
213
                        Password:          "placeholder",