environs/config: more restrictive New

provider/local/config_test.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package local_test
 
 import (
         "os"
         "path/filepath"
         "runtime"
         "syscall"
 
         gc "launchpad.net/gocheck"
 
         "launchpad.net/juju-core/environs/config"
+        "launchpad.net/juju-core/juju/osenv"
         "launchpad.net/juju-core/provider"
         "launchpad.net/juju-core/provider/local"
         "launchpad.net/juju-core/testing"
 )
 
 type configSuite struct {
         baseProviderSuite
         oldUser string
 }
 
@@ skipping 24 matching lines @@
         c.Assert(err, gc.IsNil)
         return testConfig
 }
 
 func (s *configSuite) TestValidateConfig(c *gc.C) {
         testConfig := minimalConfig(c)
 
         valid, err := local.Provider.Validate(testConfig, nil)
         c.Assert(err, gc.IsNil)
 
-        expectedRootDir := filepath.Join(os.Getenv("HOME"), ".juju", "test")
+        expectedRootDir := filepath.Join(osenv.Home(), ".juju", "test")
         unknownAttrs := valid.UnknownAttrs()
         c.Assert(unknownAttrs["root-dir"], gc.Equals, expectedRootDir)
 }
 
 func (s *configSuite) TestValidateConfigWithRootDir(c *gc.C) {
         values := minimalConfigValues()
         root := c.MkDir()
         values["root-dir"] = root
         testConfig, err := config.New(config.NoDefaults, values)
         c.Assert(err, gc.IsNil)
 
         valid, err := local.Provider.Validate(testConfig, nil)
         c.Assert(err, gc.IsNil)
         unknownAttrs := valid.UnknownAttrs()
         c.Assert(unknownAttrs["root-dir"], gc.Equals, root)
 }
 
 func (s *configSuite) TestValidateConfigWithTildeInRootDir(c *gc.C) {
         values := minimalConfigValues()
         values["root-dir"] = "~/.juju/foo"
         testConfig, err := config.New(config.NoDefaults, values)
         c.Assert(err, gc.IsNil)
 
         valid, err := local.Provider.Validate(testConfig, nil)
         c.Assert(err, gc.IsNil)
 
-        expectedRootDir := filepath.Join(os.Getenv("HOME"), ".juju", "foo")
+        expectedRootDir := filepath.Join(osenv.Home(), ".juju", "foo")
         unknownAttrs := valid.UnknownAttrs()
         c.Assert(unknownAttrs["root-dir"], gc.Equals, expectedRootDir)
 }
 
 func (s *configSuite) TestNamespace(c *gc.C) {
         testConfig := minimalConfig(c)
         c.Assert(local.ConfigNamespace(testConfig), gc.Equals, "tester-test")
 }
 
 func (s *configSuite) TestNamespaceRootNoSudo(c *gc.C) {
@@ skipping 108 matching lines @@
         c.Assert(err, gc.IsNil)
         // Check that the dirs are owned by the UID/GID set above..
         for _, dir := range local.CheckDirs(c, testConfig) {
                 info, err := os.Stat(dir)
                 c.Assert(err, gc.IsNil)
                 // This call is linux specific, but then so is sudo
                 c.Assert(info.Sys().(*syscall.Stat_t).Uid, gc.Equals, uint32(1000))
                 c.Assert(info.Sys().(*syscall.Stat_t).Gid, gc.Equals, uint32(1000))
         }
 }