environ: initial writing of environments.yaml

environs/config_test.go

 // Copyright 2011, 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package environs_test
 
 import (
         "os"
         "path/filepath"
 
         . "launchpad.net/gocheck"
@@ skipping 146 matching lines @@
         path := testing.HomePath(".juju", "environments.yaml")
         c.Assert(path, Equals, outfile)
 
         es, err := environs.ReadEnvirons("")
         c.Assert(err, IsNil)
         e, err := es.Open("")
         c.Assert(err, IsNil)
         c.Assert(e.Name(), Equals, "only")
 }
 
-func (suite) TestConfigDirPerm(c *C) {
-        defer testing.MakeEmptyFakeHomeWithoutJuju(c).Restore()
-
+func (suite) TestConfigPerm(c *C) {
+        defer testing.MakeSampleHome(c).Restore()
+
+        path := testing.HomePath(".juju")
+        info, err := os.Lstat(path)
+        c.Assert(err, IsNil)
+        oldPerm := info.Mode().Perm()
         env := `
 environments:
     only:
         type: dummy
         state-server: false
         authorized-keys: i-am-a-key
 `
         outfile, err := environs.WriteEnvirons("", env)
         c.Assert(err, IsNil)
-        path := testing.HomePath(".juju", "environments.yaml")
-        c.Assert(path, Equals, outfile)
-
-        info, err := os.Lstat(filepath.Dir(path))
-        c.Assert(err, IsNil)
-        c.Assert(uint32(info.Mode().Perm()), Equals, uint32(0700))
-}
-
-func (suite) TestConfigFilePerm(c *C) {
-        defer testing.MakeEmptyFakeHome(c).Restore()
-
-        env := `
-environments:
-    only:
-        type: dummy
-        state-server: false
-        authorized-keys: i-am-a-key
-`
-        outfile, err := environs.WriteEnvirons("", env)
-        c.Assert(err, IsNil)
-        path := testing.HomePath(".juju", "environments.yaml")
-        c.Assert(path, Equals, outfile)
-
-        info, err := os.Lstat(path)
-        c.Assert(err, IsNil)
-        c.Assert(uint32(info.Mode().Perm()), Equals, uint32(0600))
+
+        info, err = os.Lstat(outfile)
+        c.Assert(err, IsNil)
+        c.Assert(info.Mode().Perm(), Equals, os.FileMode(0600))
+
+        info, err = os.Lstat(filepath.Dir(outfile))
+        c.Assert(err, IsNil)
+        c.Assert(info.Mode().Perm(), Equals, oldPerm)
+
 }
 
 func (suite) TestNamedConfigFile(c *C) {
         defer testing.MakeFakeHomeNoEnvironments(c, "only").Restore()
 
         env := `
 environments:
     only:
         type: dummy
         state-server: false
@@ skipping 46 matching lines @@
         c.Assert(err, IsNil)
         cfg1, err := environs.BootstrapConfig(cfg)
         c.Assert(err, IsNil)
 
         expect := cfg.AllAttrs()
         delete(expect, "secret")
         expect["admin-secret"] = ""
         expect["ca-private-key"] = ""
         c.Assert(cfg1.AllAttrs(), DeepEquals, expect)
 }