A round of bug-fixing on OS X

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

2 files changed, 8 insertions, 3 deletions

diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index 3abc84f1b..baf25aab5 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -263,6 +263,7 @@ class TestTransactions < Test::Unit::TestCase
         states = {}
         check = [:group,:mode]
         file[:check] = check
+        file[:group] = @groups[0]
 
         @@tmpfiles << execfile
 
@@ -284,7 +285,7 @@ class TestTransactions < Test::Unit::TestCase
             file[:mode] = "755"
         }
 
-        trans = assert_events([:file_changed, :triggered], component)
+        trans = assert_events([:file_changed, :file_changed, :triggered], component)
 
         assert(FileTest.exists?(execfile), "Execfile does not exist")
         File.unlink(execfile)
@@ -305,6 +306,8 @@ class TestTransactions < Test::Unit::TestCase
         states = {}
         check = [:group,:mode]
         file[:check] = check
+        file[:group] = @groups[0]
+        assert_apply(file)
 
         fcomp = newcomp("file",file)
         ecomp = newcomp("exec",exec)
diff --git a/test/types/package.rb b/test/types/package.rb
index fa017b14f..3cf1ea34c 100755
--- a/test/types/package.rb
+++ b/test/types/package.rb
@@ -353,8 +353,10 @@ class TestPackages < Test::Unit::TestCase
             end
 
             # The file installed, and the receipt
-            @@tmpfiles << "/tmp/file"
-            @@tmpfiles << "/Library/Receipts/pkgtesting.pkg"
+            cleanup do
+                FileUtils.rmtree("/tmp/file")
+                FileUtils.rmtree("/Library/Receipts/pkgtesting.pkg")
+            end
 
             assert_events([:package_installed], pkg, "package")