← Back to branch summary

~jameinel/juju-core/api-facade-registry

« back to all changes in this revision

Viewing changes to provider/ec2/config_test.go

  • Committer: John Arbash Meinel
  • Date: 2014-05-20 14:20:42 UTC
  • mfrom: (2721.1.4 api-rpc-reflect-version)
  • Revision ID: john@arbash-meinel.com-20140520142042-0p32ldi3wxon92fl
Merged api-rpc-reflect-version into api-facade-registry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
provider/ec2/config_test.go
18
18
        "launchpad.net/juju-core/environs/config"
19
19
        "launchpad.net/juju-core/juju/osenv"
20
20
        "launchpad.net/juju-core/testing"
21
 
        "launchpad.net/juju-core/testing/testbase"
22
21
)
23
22
 
24
23
// Use local suite since this file lives in the ec2 package
25
24
// for testing internals.
26
25
type ConfigSuite struct {
27
 
        testbase.LoggingSuite
 
26
        testing.BaseSuite
28
27
        savedHome, savedAccessKey, savedSecretKey string
29
28
}
30
29
 
243
242
}
244
243
 
245
244
func (s *ConfigSuite) SetUpTest(c *gc.C) {
246
 
        s.LoggingSuite.SetUpTest(c)
 
245
        s.BaseSuite.SetUpTest(c)
247
246
        s.savedHome = osenv.Home()
248
247
        s.savedAccessKey = os.Getenv("AWS_ACCESS_KEY_ID")
249
248
        s.savedSecretKey = os.Getenv("AWS_SECRET_ACCESS_KEY")
266
265
        os.Setenv("AWS_ACCESS_KEY_ID", s.savedAccessKey)
267
266
        os.Setenv("AWS_SECRET_ACCESS_KEY", s.savedSecretKey)
268
267
        delete(aws.Regions, "configtest")
269
 
        s.LoggingSuite.TearDownTest(c)
 
268
        s.BaseSuite.TearDownTest(c)
270
269
}
271
270
 
272
271
func (s *ConfigSuite) TestConfig(c *gc.C) {