Merge branch '2.6.x' into next

Manually Resolved Conflicts:
	lib/puppet/resource/type_collection.rb
	spec/unit/configurer_spec.rb
	spec/unit/indirector/catalog/active_record_spec.rb
	spec/unit/resource/type_collection_spec.rb
	spec/unit/transaction/resource_harness_spec.rb

5 files changed, 6 insertions, 12 deletions

diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index edfee74e5..bfc14fa2d 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -37,6 +37,9 @@ class TestSnippets < Test::Unit::TestCase
   end
 
   def assert_mode_equal(mode, path)
+    if mode.is_a? Integer
+      mode = mode.to_s(8)
+    end
     unless file = @catalog.resource(:file, path)
       raise "Could not find file #{path}"
     end
diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb
index e022f123c..bca5d9634 100644
--- a/test/lib/puppettest/support/utils.rb
+++ b/test/lib/puppettest/support/utils.rb
@@ -92,7 +92,7 @@ module PuppetTest::Support::Utils
     method = type
 
     trans.send(method)
-    newevents = trans.events.reject { |e| e.status == 'failure' }.collect { |e|
+    newevents = trans.events.reject { |e| ['failure', 'audit'].include? e.status }.collect { |e|
       e.name
     }
 
diff --git a/test/network/server/mongrel_test.rb b/test/network/server/mongrel_test.rb
index ded275170..ca215ee25 100755
--- a/test/network/server/mongrel_test.rb
+++ b/test/network/server/mongrel_test.rb
@@ -95,11 +95,5 @@ class TestMongrelServer < PuppetTest::TestCase
     assert_equal(ip, info.ip, "Did not copy over ip correctly")
     assert_equal(Resolv.getname(ip), info.name, "Did not look up hostname correctly")
   end
-
-  def test_daemonize
-    mongrel = mkserver
-
-    assert(mongrel.respond_to?(:daemonize), "Mongrel server does not respond to daemonize")
-  end
 end
 
diff --git a/test/ral/type/file.rb b/test/ral/type/file.rb
index 7ded8d783..2285e72c8 100755
--- a/test/ral/type/file.rb
+++ b/test/ral/type/file.rb
@@ -612,7 +612,7 @@ class TestFile < Test::Unit::TestCase
         
       :mode => "0777"
     )
-    assert_equal(0777, file.should(:mode), "Mode did not get set correctly")
+    assert_equal("777", file.should(:mode), "Mode did not get set correctly")
     assert_apply(file)
     assert_equal(0777, File.stat(path).mode & 007777, "file mode is incorrect")
     File.unlink(path)
diff --git a/test/ral/type/filesources.rb b/test/ral/type/filesources.rb
index ace49211c..3363aafb3 100755
--- a/test/ral/type/filesources.rb
+++ b/test/ral/type/filesources.rb
@@ -327,12 +327,9 @@ class TestFileSources < Test::Unit::TestCase
 
     file = nil
     assert_nothing_raised {
-
-            file = Puppet::Type.type(:file).new(
-                
+      file = Puppet::Type.type(:file).new(
         :name => dest,
         :ensure => "file",
-        
         :source => source
       )
     }