Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	test/util/posixtest.rb

1 files changed, 25 insertions, 2 deletions

diff --git a/test/util/posixtest.rb b/test/util/posixtest.rb
index 8fd11b086..f64a95d18 100755
--- a/test/util/posixtest.rb
+++ b/test/util/posixtest.rb
@@ -25,16 +25,39 @@ class TestPosixUtil < Test::Unit::TestCase
 	def test_get_posix_field
 	    {:group => nonrootgroup, :passwd => nonrootuser}.each do |space, obj|
             id = Puppet::Util.idfield(space)
-	        [obj.name, obj.send(id), obj.send(id).to_s].each do |test|
+	        [obj.name, obj.send(id)].each do |test|
         	    value = nil
         	    assert_nothing_raised do
         	        value = get_posix_field(space, :name, test)
         	    end
-        	    assert_equal(obj.name, value, "did not get correct value from get_posix_field")
+        	    assert_equal(obj.name, value, "did not get correct value from get_posix_field (known to be broken on some platforms)")
     	    end
 	    end
     end
     
+    def test_search_posix_field
+        {:group => nonrootgroup, :passwd => nonrootuser}.each do |space, obj|
+              id = Puppet::Util.idfield(space)
+            [obj.name, obj.send(id)].each do |test|
+                value = nil
+                assert_nothing_raised do
+                    value = search_posix_field(space, :name, test)
+                end
+                assert_equal(obj.name, value, "did not get correct value from search_posix_field")
+            end
+        end
+      end
+    
+    def test_get_provider_value
+        user = nonrootuser
+        obj = mk_posix_resource(:user, user)
+        
+        assert_nothing_raised do
+            assert_equal(user.uid, get_provider_value(:user, :uid, user.uid))
+            assert_equal(user.name, get_provider_value(:user, :name, user.name))
+        end
+    end
+    
     def test_gid_and_uid
         {:user => nonrootuser, :group => nonrootgroup}.each do |type, obj|
             method = idfield(type)