| Index: environs/imagemetadata/validation_test.go |
| === modified file 'environs/imagemetadata/validation_test.go' |
| --- environs/imagemetadata/validation_test.go 2013-09-24 08:01:52 +0000 |
| +++ environs/imagemetadata/validation_test.go 2013-10-11 04:09:04 +0000 |
| @@ -6,16 +6,14 @@ |
| import ( |
| gc "launchpad.net/gocheck" |
| - "launchpad.net/juju-core/environs/config" |
| "launchpad.net/juju-core/environs/imagemetadata" |
| "launchpad.net/juju-core/environs/simplestreams" |
| - coretesting "launchpad.net/juju-core/testing" |
| "launchpad.net/juju-core/testing/testbase" |
| ) |
| type ValidateSuite struct { |
| testbase.LoggingSuite |
| - home *coretesting.FakeHome |
| + metadataDir string |
| } |
| var _ = gc.Suite(&ValidateSuite{}) |
| @@ -29,7 +27,7 @@ |
| Region: region, |
| Endpoint: endpoint, |
| } |
| - _, err := imagemetadata.MakeBoilerplate("", series, &im, &cloudSpec, false) |
| + _, err := imagemetadata.GenerateMetadata(series, &im, &cloudSpec, s.metadataDir) |
| if err != nil { |
| return err |
| } |
| @@ -38,23 +36,17 @@ |
| func (s *ValidateSuite) SetUpTest(c *gc.C) { |
| s.LoggingSuite.SetUpTest(c) |
| - s.home = coretesting.MakeEmptyFakeHome(c) |
| -} |
| - |
| -func (s *ValidateSuite) TearDownTest(c *gc.C) { |
| - s.home.Restore() |
| - s.LoggingSuite.TearDownTest(c) |
| + s.metadataDir = c.MkDir() |
| } |
| func (s *ValidateSuite) TestMatch(c *gc.C) { |
| s.makeLocalMetadata(c, "1234", "region-2", "raring", "some-auth-url") |
| - metadataDir := config.JujuHomePath("") |
| params := &simplestreams.MetadataLookupParams{ |
| Region: "region-2", |
| Series: "raring", |
| Architectures: []string{"amd64"}, |
| Endpoint: "some-auth-url", |
| - Sources: []simplestreams.DataSource{simplestreams.NewURLDataSource("file://"+metadataDir, simplestreams.VerifySSLHostnames)}, |
| + Sources: []simplestreams.DataSource{simplestreams.NewURLDataSource("file://"+s.metadataDir, simplestreams.VerifySSLHostnames)}, |
| } |
| imageIds, err := imagemetadata.ValidateImageMetadata(params) |
| c.Assert(err, gc.IsNil) |
| @@ -63,13 +55,12 @@ |
| func (s *ValidateSuite) TestNoMatch(c *gc.C) { |
| s.makeLocalMetadata(c, "1234", "region-2", "raring", "some-auth-url") |
| - metadataDir := config.JujuHomePath("") |
| params := &simplestreams.MetadataLookupParams{ |
| Region: "region-2", |
| Series: "precise", |
| Architectures: []string{"amd64"}, |
| Endpoint: "some-auth-url", |
| - Sources: []simplestreams.DataSource{simplestreams.NewURLDataSource("file://"+metadataDir, simplestreams.VerifySSLHostnames)}, |
| + Sources: []simplestreams.DataSource{simplestreams.NewURLDataSource("file://"+s.metadataDir, simplestreams.VerifySSLHostnames)}, |
| } |
| _, err := imagemetadata.ValidateImageMetadata(params) |
| c.Assert(err, gc.Not(gc.IsNil)) |
