diff options
author | Luke Kanies <luke@madstop.com> | 2008-11-25 13:21:32 -0600 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2008-11-26 12:56:12 +1100 |
commit | 5bd27c8b81c3250dd04307460868ff113b64190c (patch) | |
tree | f351f63bbfcaafae9b93f364483402817ed7cdad /lib/puppet | |
parent | a3140b2285d3cb3ccc44efa2110da58771834cde (diff) | |
download | puppet-5bd27c8b81c3250dd04307460868ff113b64190c.tar.gz puppet-5bd27c8b81c3250dd04307460868ff113b64190c.tar.xz puppet-5bd27c8b81c3250dd04307460868ff113b64190c.zip |
Partially fixing #1772 - broken 'resources' tests.
The main problem was that the directory_services user provider was returning
a string for its uid instead of an integer. I also began a 'resources'
spec file.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r-- | lib/puppet/provider/nameservice/directoryservice.rb | 3 | ||||
-rw-r--r-- | lib/puppet/type/resources.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb index a20a8a96e..ecd5fa6f4 100644 --- a/lib/puppet/provider/nameservice/directoryservice.rb +++ b/lib/puppet/provider/nameservice/directoryservice.rb @@ -369,6 +369,9 @@ class DirectoryService < Puppet::Provider::NameService type_properties.delete(:ensure) if type_properties.include? :ensure type_properties << :guid # append GeneratedUID so we just get the report here @property_value_cache_hash = self.class.single_report(@resource[:name], *type_properties) + [:uid, :gid].each do |param| + @property_value_cache_hash[param] = @property_value_cache_hash[param].to_i if @property_value_cache_hash and @property_value_cache_hash.include?(param) + end end return @property_value_cache_hash end diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb index c0d892bb8..358ad603b 100644 --- a/lib/puppet/type/resources.rb +++ b/lib/puppet/type/resources.rb @@ -137,6 +137,7 @@ Puppet::Type.newtype(:resources) do return false end + p current_values[resource.property(:uid)] if current_values[resource.property(:uid)] <= self[:unless_system_user] return false else |