Hopefully final bug fixes in preparation for 0.16.3

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

3 files changed, 16 insertions, 2 deletions

diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index 8d4cf86bf..44d888ce2 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -278,7 +278,7 @@ module Puppet
 
                         unless File.stat(file).mode == File.stat(bfile).mode
                             mode = File.stat(file).mode & 007777
-                            File.chown(mode, bfile)
+                            File.chmod(mode, bfile)
                         end
                         return true
                     rescue => detail
diff --git a/test/server/pelement.rb b/test/server/pelement.rb
index 13bd3657f..7d39d05c1 100644
--- a/test/server/pelement.rb
+++ b/test/server/pelement.rb
@@ -259,15 +259,23 @@ class TestPElementServer < Test::Unit::TestCase
 
         Puppet::Type.type(:file).clear
 
+        Puppet.err filetrans[:parent].inspect
+
+        #p filetrans
+
         bucket = Puppet::TransBucket.new
         bucket.type = "file"
         bucket.push filetrans
 
+        #p bucket
+
+        oldbucket = bucket.dup
         File.unlink(file)
         assert_nothing_raised {
             server.apply(bucket)
         }
 
+
         assert(FileTest.exists?(file), "File did not get recreated")
 
         # Now try it as a "nonlocal" server
@@ -280,10 +288,11 @@ class TestPElementServer < Test::Unit::TestCase
         Puppet::Type.type(:file).clear
         File.unlink(file)
 
-        if yaml =~ /(.{20}Loglevel.{20})/
+        if Base64.decode64(yaml) =~ /(.{20}Loglevel.{20})/
             Puppet.warning "YAML is broken on this machine"
             return
         end
+        #puts Base64.decode64(yaml)
         assert_nothing_raised("Could not reload yaml") {
             YAML::load(Base64.decode64(yaml))
         }
diff --git a/test/types/package.rb b/test/types/package.rb
index f43b051b8..20177289d 100644
--- a/test/types/package.rb
+++ b/test/types/package.rb
@@ -166,6 +166,11 @@ class TestPackages < Test::Unit::TestCase
 
         state = obj.state(:ensure)
         assert(state, "Could not retrieve ensure state")
+
+        # Add a fake state, for those that need it
+        file = tempfile()
+        File.open(file, "w") { |f| f.puts :yayness }
+        obj[:source] = file
         assert_raise(Puppet::PackageError,
             "Successfully installed nonexistent package") {
             state.sync