environs/config: more restrictive New

testing/environ.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package testing
 
 import (
         "io/ioutil"
         "os"
         "path/filepath"
 
         . "launchpad.net/gocheck"
 
         "launchpad.net/juju-core/environs/config"
+        "launchpad.net/juju-core/juju/osenv"
 )
 
-var FakeConfig = Attrs{
-        "type":                      "someprovider",
-        "name":                      "testenv",
-        "authorized-keys":           "my-keys",
-        "firewall-mode":             config.FwInstance,
-        "admin-secret":              "fish",
-        "ca-cert":                   CACert,
-        "ca-private-key":            CAKey,
-        "ssl-hostname-verification": true,
-        "development":               false,
-        "state-port":                1234,
-        "api-port":                  4321,
-        "default-series":            "precise",
+// FakeConfig() returns an environment configuration for a
+// fake provider with all required attributes set.
+func FakeConfig() Attrs {
+        return Attrs{
+                "type":                      "someprovider",
+                "name":                      "testenv",
+                "authorized-keys":           "my-keys",
+                "firewall-mode":             config.FwInstance,
+                "admin-secret":              "fish",
+                "ca-cert":                   CACert,
+                "ca-private-key":            CAKey,
+                "ssl-hostname-verification": true,
+                "development":               false,
+                "state-port":                19034,
+                "api-port":                  17777,
+                "default-series":            config.DefaultSeries,
+        }
 }
 
 // EnvironConfig returns a default environment configuration suitable for
 // setting in the state.
 func EnvironConfig(c *C) *config.Config {
-        attrs := FakeConfig.Merge(Attrs{
+        attrs := FakeConfig().Merge(Attrs{
                 "agent-version": "1.2.3",
         }).Delete("admin-secret", "ca-private-key")
         cfg, err := config.New(config.NoDefaults, attrs)
         c.Assert(err, IsNil)
         return cfg
 }
 
 const (
         SampleEnvName = "erewhemos"
         EnvDefault    = "default:\n  " + SampleEnvName + "\n"
@@ skipping 84 matching lines @@
 }
 
 func MakeEmptyFakeHome(c *C) *FakeHome {
         fake := MakeEmptyFakeHomeWithoutJuju(c)
         err := os.Mkdir(config.JujuHome(), 0700)
         c.Assert(err, IsNil)
         return fake
 }
 
 func MakeEmptyFakeHomeWithoutJuju(c *C) *FakeHome {
-        oldHomeEnv := os.Getenv("HOME")
+        oldHomeEnv := osenv.Home()
         oldJujuHomeEnv := os.Getenv("JUJU_HOME")
         oldJujuEnv := os.Getenv("JUJU_ENV")
         fakeHome := c.MkDir()
-        os.Setenv("HOME", fakeHome)
+        osenv.SetHome(fakeHome)
         os.Setenv("JUJU_HOME", "")
         os.Setenv("JUJU_ENV", "")
         jujuHome := filepath.Join(fakeHome, ".juju")
         oldJujuHome := config.SetJujuHome(jujuHome)
         return &FakeHome{
                 oldHomeEnv:     oldHomeEnv,
                 oldJujuEnv:     oldJujuEnv,
                 oldJujuHomeEnv: oldJujuHomeEnv,
                 oldJujuHome:    oldJujuHome,
                 files:          []TestFile{},
         }
 }
 
 func HomePath(names ...string) string {
-        all := append([]string{os.Getenv("HOME")}, names...)
+        all := append([]string{osenv.Home()}, names...)
         return filepath.Join(all...)
 }
 
 func (h *FakeHome) Restore() {
         config.SetJujuHome(h.oldJujuHome)
         os.Setenv("JUJU_ENV", h.oldJujuEnv)
         os.Setenv("JUJU_HOME", h.oldJujuHomeEnv)
-        os.Setenv("HOME", h.oldHomeEnv)
+        osenv.SetHome(h.oldHomeEnv)
 }
 
 func (h *FakeHome) AddFiles(c *C, files []TestFile) {
         for _, f := range files {
                 path := HomePath(f.Name)
                 err := os.MkdirAll(filepath.Dir(path), 0700)
                 c.Assert(err, IsNil)
                 err = ioutil.WriteFile(path, []byte(f.Data), 0666)
                 c.Assert(err, IsNil)
                 h.files = append(h.files, f)
@@ skipping 39 matching lines @@
 }
 
 // PatchEnvironment provides a test a simple way to override a single
 // environment variable. A function is returned that will return the
 // environment to what it was before.
 func PatchEnvironment(name, value string) func() {
         oldValue := os.Getenv(name)
         os.Setenv(name, value)
         return func() { os.Setenv(name, oldValue) }
 }