A round of fixes so unit tests pass; most of the failures were from the merging of the transaction-refactor branch

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

1 files changed, 5 insertions, 4 deletions

diff --git a/test/util/posixtest.rb b/test/util/posixtest.rb
index 7939afd46..8c4174144 100755
--- a/test/util/posixtest.rb
+++ b/test/util/posixtest.rb
@@ -90,8 +90,9 @@ class TestPosixUtil < Test::Unit::TestCase
                 :check => [:gid]
             )
             obj.setdefaults
-            obj.retrieve
-            id = obj.is(:gid)
+            current = obj.retrieve
+            id = nil
+            current.find { |prop, value| id = value if prop.name == :gid }
             gid = nil
             assert_nothing_raised {
                 gid = Puppet::Util.gid(id)
@@ -146,7 +147,7 @@ class TestPosixUtil < Test::Unit::TestCase
         )
         obj.setdefaults
         obj.retrieve
-        id = obj.is(:uid)
+        id = obj.provider.uid
         uid = nil
         assert_nothing_raised {
             uid = Puppet::Util.uid(id)
@@ -170,4 +171,4 @@ class TestPosixUtil < Test::Unit::TestCase
     end
 end
 
-# $Id$
\ No newline at end of file
+# $Id$