summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajax <ajax@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-31 18:19:12 +0000
committerajax <ajax@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-31 18:19:12 +0000
commitd7fde427ad38329c8ad044ce3a13e88d156ebaa6 (patch)
tree3ebc5a87f1eb709448296d2dce38b4e757828d67
parenta4de59ca838b38d1c2f23e577865074c43b92593 (diff)
downloadpuppet-d7fde427ad38329c8ad044ce3a13e88d156ebaa6.tar.gz
puppet-d7fde427ad38329c8ad044ce3a13e88d156ebaa6.tar.xz
puppet-d7fde427ad38329c8ad044ce3a13e88d156ebaa6.zip
Adding explicit umasks to these tests.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2135 980ebf18-57e1-0310-9a29-db15c13687c0
-rwxr-xr-xtest/other/config.rb4
-rwxr-xr-xtest/types/exec.rb2
-rwxr-xr-xtest/types/file.rb4
3 files changed, 10 insertions, 0 deletions
diff --git a/test/other/config.rb b/test/other/config.rb
index 285331c72..b47b3c97a 100755
--- a/test/other/config.rb
+++ b/test/other/config.rb
@@ -534,6 +534,8 @@ yay = /a/path
# provide a method to modify and create files w/out specifying the info
# already stored in a config
def test_writingfiles
+ File.umask(0022)
+
path = tempfile()
mode = 0644
@@ -572,6 +574,8 @@ yay = /a/path
end
def test_mkdir
+ File.umask(0022)
+
path = tempfile()
mode = 0755
diff --git a/test/types/exec.rb b/test/types/exec.rb
index 0c5ee0258..7dc5fca29 100755
--- a/test/types/exec.rb
+++ b/test/types/exec.rb
@@ -335,6 +335,8 @@ class TestExec < Test::Unit::TestCase
if Puppet::SUIDManager.uid == 0
# Verify that we can execute commands as a special user
def mknverify(file, user, group = nil, id = true)
+ File.umask(0022)
+
args = {
:command => "touch %s" % file,
:path => "/usr/bin:/bin:/usr/sbin:/sbin",
diff --git a/test/types/file.rb b/test/types/file.rb
index 0e9fff23a..d0a44563d 100755
--- a/test/types/file.rb
+++ b/test/types/file.rb
@@ -996,6 +996,8 @@ class TestFile < Test::Unit::TestCase
end
def test_followlinks
+ File.umask(0022)
+
basedir = tempfile()
Dir.mkdir(basedir)
file = File.join(basedir, "file")
@@ -1274,6 +1276,8 @@ class TestFile < Test::Unit::TestCase
end
def test_backupmodes
+ File.umask(0022)
+
file = tempfile()
newfile = tempfile()