← 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/package_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/package_test.go
16
16
        "github.com/juju/juju/apiserver/testing"
17
17
        "github.com/juju/juju/environs"
18
18
        "github.com/juju/juju/environs/config"
19
 
        "github.com/juju/juju/environs/configstore"
20
19
        imagetesting "github.com/juju/juju/environs/imagemetadata/testing"
21
20
        envtesting "github.com/juju/juju/environs/testing"
22
21
        "github.com/juju/juju/jujuclient/jujuclienttesting"
122
121
        attrs := coretesting.FakeConfig().Merge(coretesting.Attrs{
123
122
                "type":       "mock",
124
123
                "controller": true,
125
 
                "state-id":   "1",
126
124
        })
127
 
        cfg, err := config.New(config.NoDefaults, attrs)
128
 
        c.Assert(err, jc.ErrorIsNil)
129
 
        _, err = environs.Prepare(
130
 
                envtesting.BootstrapContext(c), configstore.NewMem(),
 
125
        env, err := environs.Prepare(
 
126
                envtesting.BootstrapContext(c),
131
127
                jujuclienttesting.NewMemStore(),
132
 
                "dummycontroller", environs.PrepareForBootstrapParams{Config: cfg},
 
128
                environs.PrepareParams{
 
129
                        ControllerName: "dummycontroller",
 
130
                        BaseConfig:     attrs,
 
131
                        CloudName:      "dummy",
 
132
                },
133
133
        )
134
134
        c.Assert(err, jc.ErrorIsNil)
135
 
        return cfg
 
135
        return env.Config()
136
136
}