| Index: environs/imagemetadata/urls_test.go |
| === modified file 'environs/imagemetadata/urls_test.go' |
| --- environs/imagemetadata/urls_test.go 2013-09-10 03:43:51 +0000 |
| +++ environs/imagemetadata/urls_test.go 2013-09-12 14:24:43 +0000 |
| @@ -9,6 +9,7 @@ |
| "launchpad.net/juju-core/environs" |
| "launchpad.net/juju-core/environs/imagemetadata" |
| sstesting "launchpad.net/juju-core/environs/simplestreams/testing" |
| + "launchpad.net/juju-core/provider/dummy" |
| "launchpad.net/juju-core/testing" |
| ) |
| @@ -27,16 +28,11 @@ |
| } |
| func (s *URLsSuite) env(c *gc.C, imageMetadataURL string) environs.Environ { |
| - attrs := map[string]interface{}{ |
| - "name": "only", |
| - "type": "dummy", |
| - "authorized-keys": "foo", |
| - "state-server": true, |
| - "ca-cert": testing.CACert, |
| - "ca-private-key": testing.CAKey, |
| - } |
| + attrs := dummy.SampleConfig() |
| if imageMetadataURL != "" { |
| - attrs["image-metadata-url"] = imageMetadataURL |
| + attrs = attrs.Merge(testing.Attrs{ |
| + "image-metadata-url": imageMetadataURL, |
| + }) |
| } |
| env, err := environs.NewFromAttrs(attrs) |
| c.Assert(err, gc.IsNil) |
