diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-19 10:30:12 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-19 10:30:12 -0600 |
| commit | 8f82fc42844931efe8df042cf2d40d0d624c2d55 (patch) | |
| tree | 02849949d5625f72346001a74dae0c4e86bc7b16 | |
| parent | 0ae55774a67f481181feeb241538a94bbeae88de (diff) | |
| parent | a6ad326f71b8aaa0bce40c4d6c29195c53ec1d1f (diff) | |
| download | puppet-8f82fc42844931efe8df042cf2d40d0d624c2d55.tar.gz puppet-8f82fc42844931efe8df042cf2d40d0d624c2d55.tar.xz puppet-8f82fc42844931efe8df042cf2d40d0d624c2d55.zip | |
Merge commit 'davids-bugfixes/tests/fix-cron-tests'
| -rwxr-xr-x | lib/puppet/type/cron.rb | 2 | ||||
| -rwxr-xr-x | test/ral/types/cron.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb index 3154098db..17cb1667f 100755 --- a/lib/puppet/type/cron.rb +++ b/lib/puppet/type/cron.rb @@ -348,7 +348,7 @@ Puppet::Type.newtype(:cron) do The user defaults to whomever Puppet is running as." - defaultto { ENV["USER"] || "root" } + defaultto { Etc.getpwuid(Process.uid).name || "root" } end newproperty(:target) do diff --git a/test/ral/types/cron.rb b/test/ral/types/cron.rb index a9a00240c..ca60477ed 100755 --- a/test/ral/types/cron.rb +++ b/test/ral/types/cron.rb @@ -464,9 +464,9 @@ class TestCron < Test::Unit::TestCase inst = @crontype.create( :name => "something", :command => "/some/thing", :provider => :crontab) - assert_equal(ENV["USER"], inst.should(:user), + assert_equal(Etc.getpwuid(Process.uid).name, inst.should(:user), "user did not default to current user with crontab") - assert_equal(ENV["USER"], inst.should(:target), + assert_equal(Etc.getpwuid(Process.uid).name, inst.should(:target), "target did not default to current user with crontab") # Now make a new cron with a user, and make sure it gets copied |