← 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/imagemetadata_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/environs/imagemetadata_test.go
10
10
        gc "gopkg.in/check.v1"
11
11
 
12
12
        "github.com/juju/juju/environs"
13
 
        "github.com/juju/juju/environs/config"
14
 
        "github.com/juju/juju/environs/configstore"
15
13
        "github.com/juju/juju/environs/imagemetadata"
16
14
        "github.com/juju/juju/environs/simplestreams"
17
15
        sstesting "github.com/juju/juju/environs/simplestreams/testing"
45
43
                        "image-metadata-url": imageMetadataURL,
46
44
                })
47
45
        }
48
 
        cfg, err := config.New(config.NoDefaults, attrs)
49
 
        c.Assert(err, jc.ErrorIsNil)
50
46
        env, err := environs.Prepare(
51
 
                envtesting.BootstrapContext(c), configstore.NewMem(),
 
47
                envtesting.BootstrapContext(c),
52
48
                jujuclienttesting.NewMemStore(),
53
 
                cfg.Name(), environs.PrepareForBootstrapParams{Config: cfg},
 
49
                environs.PrepareParams{
 
50
                        ControllerName: attrs["name"].(string),
 
51
                        BaseConfig:     attrs,
 
52
                        CloudName:      "dummy",
 
53
                },
54
54
        )
55
55
        c.Assert(err, jc.ErrorIsNil)
56
56
        return env