From 7afa69cf4fcf0a42f4c3cbfce407f341b8a0d81d Mon Sep 17 00:00:00 2001 From: luke Date: Fri, 5 Jan 2007 21:49:24 +0000 Subject: Fixing rake test so it works with the new puppet loader git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2056 980ebf18-57e1-0310-9a29-db15c13687c0 --- test/lib/puppettest.rb | 2 +- test/types/file.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb index dc56d3138..4bf3bc54c 100755 --- a/test/lib/puppettest.rb +++ b/test/lib/puppettest.rb @@ -71,7 +71,7 @@ module PuppetTest end def rake? - $0 =~ /rake_test_loader/ + $0 =~ /test_loader/ end def setup diff --git a/test/types/file.rb b/test/types/file.rb index 61ee14694..321bfaef6 100755 --- a/test/types/file.rb +++ b/test/types/file.rb @@ -267,6 +267,7 @@ class TestFile < Test::Unit::TestCase def test_groupasroot file = mktestfile() [%x{groups}.chomp.split(/ /), Process.groups].flatten.each { |group| + next unless Puppet::Util.gid(group) # grr. assert_nothing_raised() { file[:group] = group } -- cgit