← 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/apiserver/imagemetadata/functions_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/apiserver/imagemetadata/functions_test.go
13
13
        "github.com/juju/juju/apiserver/params"
14
14
        "github.com/juju/juju/environs"
15
15
        "github.com/juju/juju/environs/config"
16
 
        "github.com/juju/juju/environs/configstore"
17
16
        envtesting "github.com/juju/juju/environs/testing"
18
17
        "github.com/juju/juju/jujuclient/jujuclienttesting"
19
18
        "github.com/juju/juju/state/cloudimagemetadata"
32
31
func (s *funcSuite) SetUpTest(c *gc.C) {
33
32
        s.baseImageMetadataSuite.SetUpTest(c)
34
33
 
35
 
        cfg, err := config.New(config.NoDefaults, mockConfig())
36
 
        c.Assert(err, jc.ErrorIsNil)
 
34
        var err error
37
35
        s.env, err = environs.Prepare(
38
 
                envtesting.BootstrapContext(c), configstore.NewMem(),
 
36
                envtesting.BootstrapContext(c),
39
37
                jujuclienttesting.NewMemStore(),
40
 
                "dummycontroller", environs.PrepareForBootstrapParams{Config: cfg},
 
38
                environs.PrepareParams{
 
39
                        ControllerName: "dummycontroller",
 
40
                        BaseConfig:     mockConfig(),
 
41
                        CloudName:      "dummy",
 
42
                },
41
43
        )
42
44
        c.Assert(err, jc.ErrorIsNil)
43
 
        s.state = s.constructState(cfg)
 
45
        s.state = s.constructState(s.env.Config())
44
46
 
45
47
        s.expected = cloudimagemetadata.Metadata{
46
48
                cloudimagemetadata.MetadataAttributes{