Fixing #643 -- replacing the get_posix_field method with a more degenerate version that works even on broken systems

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2598 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 3 insertions, 7 deletions

diff --git a/test/util/posixtest.rb b/test/util/posixtest.rb
index 8c4174144..0dd437fa8 100755
--- a/test/util/posixtest.rb
+++ b/test/util/posixtest.rb
@@ -23,18 +23,14 @@ class TestPosixUtil < Test::Unit::TestCase
     end
 	
 	def test_get_posix_field
-	    {:gr => nonrootgroup, :pw => nonrootuser}.each do |space, obj|
-	        if space == :gr
-	            id = :gid
-            else
-                id = :uid
-            end
+	    {: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|
         	    value = nil
         	    assert_nothing_raised do
         	        value = get_posix_field(space, :name, test)
         	    end
-        	    assert_equal(obj.name, value)
+        	    assert_equal(obj.name, value, "did not get correct value from get_posix_field")
     	    end
 	    end
     end