environs/config: more restrictive New

provider/local/environ_test.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package local_test
 
 import (
         "io/ioutil"
         "os"
         "path/filepath"
 
@@ skipping 44 matching lines @@
         s.baseProviderSuite.SetUpTest(c)
         // Construct the directories first.
         err := local.CreateDirs(c, minimalConfig(c))
         c.Assert(err, gc.IsNil)
         s.oldUpstartLocation = local.SetUpstartScriptLocation(c.MkDir())
         s.oldPath = os.Getenv("PATH")
         s.testPath = c.MkDir()
         os.Setenv("PATH", s.testPath+":"+s.oldPath)
 
         // Add in an admin secret
-        s.Tests.TestConfig.Config["admin-secret"] = "sekrit"
+        s.Tests.TestConfig["admin-secret"] = "sekrit"
         s.restoreRootCheck = local.SetRootCheckFunction(func() bool { return true })
         s.Tests.SetUpTest(c)
         s.dbServiceName = "juju-db-" + local.ConfigNamespace(s.Env.Config())
 }
 
 func (s *localJujuTestSuite) TearDownTest(c *gc.C) {
         s.Tests.TearDownTest(c)
         os.Setenv("PATH", s.oldPath)
         s.restoreRootCheck()
         local.SetUpstartScriptLocation(s.oldUpstartLocation)
@@ skipping 10 matching lines @@
 func (s *localJujuTestSuite) StoppedStatus(c *gc.C) {
         s.MakeTool(c, "status", `echo "some-service stop/waiting"`)
 }
 
 func (s *localJujuTestSuite) RunningStatus(c *gc.C) {
         s.MakeTool(c, "status", `echo "some-service start/running, process 123"`)
 }
 
 var _ = gc.Suite(&localJujuTestSuite{
         Tests: jujutest.Tests{
-                TestConfig: jujutest.TestConfig{minimalConfigValues()},
+                TestConfig: minimalConfigValues(),
         },
 })
 
 func (s *localJujuTestSuite) TestBootstrap(c *gc.C) {
         c.Skip("Cannot test bootstrap at this stage.")
 }
 
 func (s *localJujuTestSuite) TestStartStop(c *gc.C) {
         c.Skip("StartInstance not implemented yet.")
 }