diff options
Diffstat (limited to 'test/puppet/utiltest.rb')
| -rwxr-xr-x | test/puppet/utiltest.rb | 47 |
1 files changed, 33 insertions, 14 deletions
diff --git a/test/puppet/utiltest.rb b/test/puppet/utiltest.rb index 64eb07d17..e18971e59 100755 --- a/test/puppet/utiltest.rb +++ b/test/puppet/utiltest.rb @@ -8,13 +8,15 @@ require 'puppet' require 'puppettest' require 'test/unit' -unless Process.uid == 0 - $stderr.puts "Run as root to perform Utility tests" -else class TestPuppetUtil < Test::Unit::TestCase include TestPuppet - + unless Process.uid == 0 + $stderr.puts "Run as root to perform Utility tests" + else def mknverify(file, user, group = nil, id = false) + if File.exists?(file) + File.unlink(file) + end args = [] unless user or group args << nil @@ -60,15 +62,27 @@ class TestPuppetUtil < Test::Unit::TestCase system("touch %s" % file) } } - assert(File.exists?(file), "File does not exist") - assert_equal(File.stat(file).uid, uid, - "File is owned by %s instead of %s" % - [File.stat(file).uid, uid] - ) - assert_equal(File.stat(file).gid, gid, - "File group is %s instead of %s" % - [File.stat(file).gid, gid] - ) + if uid == 0 + #Puppet.warning "Not testing user" + else + #Puppet.warning "Testing user %s" % uid + assert(File.exists?(file), "File does not exist") + assert_equal(File.stat(file).uid, uid, + "File is owned by %s instead of %s" % + [File.stat(file).uid, uid] + ) + #system("ls -l %s" % file) + end + if gid == 0 + #Puppet.warning "Not testing group" + else + #Puppet.warning "Testing group %s" % gid + assert_equal(File.stat(file).gid, gid, + "File group is %s instead of %s" % + [File.stat(file).gid, gid] + ) + #system("ls -l %s" % file) + end assert_nothing_raised { File.unlink(file) } @@ -99,7 +113,12 @@ class TestPuppetUtil < Test::Unit::TestCase assert(Process.euid == 0, "UID did not get reset") end -end + end + + def test_capturestderr + str = Puppet::Util.capture_stderr { $stderr.puts("hello world") } + assert_equal("hello world\n", str) + end end # $Id$ |