diff options
| -rw-r--r-- | lib/puppet/provider/nameservice/directoryservice.rb | 4 | ||||
| -rwxr-xr-x | spec/unit/type/user.rb | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb index 42c52f0a7..71e6ff33e 100644 --- a/lib/puppet/provider/nameservice/directoryservice.rb +++ b/lib/puppet/provider/nameservice/directoryservice.rb @@ -118,7 +118,7 @@ class DirectoryService < Puppet::Provider::NameService begin product_version = Facter.value(:macosx_productversion) if product_version.nil? - raise Puppet::Error, "Could not determine OS X version: %s" % detail + raise Puppet::Error, "Could not determine OS X version from Facter" end product_version_major = product_version.scan(/(\d+)\.(\d+)./).join(".") if %w{10.0 10.1 10.2 10.3}.include?(product_version_major) @@ -533,4 +533,4 @@ class DirectoryService < Puppet::Provider::NameService return @property_value_cache_hash end end -end
\ No newline at end of file +end diff --git a/spec/unit/type/user.rb b/spec/unit/type/user.rb index 5c46689d3..57af7f093 100755 --- a/spec/unit/type/user.rb +++ b/spec/unit/type/user.rb @@ -70,10 +70,14 @@ describe user do describe "when retrieving all current values" do before do - @user = user.new(:name => "foo", :uid => 10, :gid => 10) + @user = user.new(:name => "foo", :uid => 10) end it "should return a hash containing values for all set properties" do + @user[:gid] = 10 + @user.property(:ensure).expects(:retrieve).returns :present + @user.property(:uid).expects(:retrieve).returns 15 + @user.property(:gid).expects(:retrieve).returns 15 values = @user.retrieve [@user.property(:uid), @user.property(:gid)].each { |property| values.should be_include(property) } end @@ -230,7 +234,7 @@ describe user do end it "should fail if a ':' is included in the password" do - lambda { @password.should = "some:thing" }.should raise_error(ArgumentError) + lambda { @password.should = "some:thing" }.should raise_error(Puppet::Error) end it "should allow the value to be set to :absent" do @@ -262,6 +266,7 @@ describe user do config = Puppet::Resource::Catalog.new :testing do |conf| [testuser, testrole].each { |resource| conf.add_resource resource } end + Puppet::Type::User::ProviderDirectoryservice.stubs(:get_macosx_version_major).returns "10.5" rel = testuser.autorequire[0] rel.source.ref.should == testrole.ref |