Fix the creation of ~/.juju/ssh to be user owned

utils/sudo_test.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package utils_test
 
 import (
         "os"
         "os/user"
         "path/filepath"
 
@@ skipping 78 matching lines @@
         err := utils.MkdirForUser(dir, 0755)
         c.Assert(err, gc.IsNil)
         c.Assert(dir, jc.IsDirectory)
 }
 
 func (s *sudoSuite) TestMkDirForUserWithError(c *gc.C) {
         s.setupBadSudoUid()
         dir := filepath.Join(c.MkDir(), "new-dir")
         err := utils.MkdirForUser(dir, 0755)
         c.Assert(err, gc.ErrorMatches, `invalid value "omg" for SUDO_UID`)
-        c.Assert(dir, jc.DoesNotExist)
+        // The directory is still there.
+        c.Assert(dir, jc.IsDirectory)
 }
 
 func (s *sudoSuite) TestMkDirAllForUserAsUser(c *gc.C) {
         dir := filepath.Join(c.MkDir(), "new-dir", "and-another")
         err := utils.MkdirAllForUser(dir, 0755)
         c.Assert(err, gc.IsNil)
         c.Assert(dir, jc.IsDirectory)
 }
 
 func (s *sudoSuite) TestMkDirAllForUserRoot(c *gc.C) {
         s.setupGoodSudoUid(c)
 
         dir := filepath.Join(c.MkDir(), "new-dir", "and-another")
         err := utils.MkdirAllForUser(dir, 0755)
         c.Assert(err, gc.IsNil)
         c.Assert(dir, jc.IsDirectory)
 }
 
 func (s *sudoSuite) TestMkDirAllForUserWithError(c *gc.C) {
         s.setupBadSudoUid()
 
         base := c.MkDir()
         dir := filepath.Join(base, "new-dir", "and-another")
         err := utils.MkdirAllForUser(dir, 0755)
         c.Assert(err, gc.ErrorMatches, `invalid value "omg" for SUDO_UID`)
-        c.Assert(dir, jc.DoesNotExist)
-        c.Assert(filepath.Dir(dir), jc.DoesNotExist)
+        // The directory is still there.
+        c.Assert(dir, jc.IsDirectory)
 }
 
 func (s *sudoSuite) TestChownToUserNotRoot(c *gc.C) {
         // Just in case someone runs the suite as root, we don't want to fail.
         s.PatchValue(&utils.CheckIfRoot, func() bool { return false })
 
         nonExistant := filepath.Join(c.MkDir(), "non-existant")
         err := utils.ChownToUser(nonExistant)
         c.Assert(err, gc.IsNil)
 }
 
 func (s *sudoSuite) TestChownToUserBadUid(c *gc.C) {
         s.setupBadSudoUid()
         err := utils.ChownToUser(c.MkDir())
         c.Assert(err, gc.ErrorMatches, `invalid value "omg" for SUDO_UID`)
 }
 
 func (s *sudoSuite) TestChownToUser(c *gc.C) {
         s.setupGoodSudoUid(c)
         err := utils.ChownToUser(c.MkDir(), c.MkDir())
         c.Assert(err, gc.IsNil)
 }