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

1 files changed, 5 insertions, 1 deletions

diff --git a/spec/unit/configurer/plugin_handler_spec.rb b/spec/unit/configurer/plugin_handler_spec.rb
index 27d5a9f06..04a479665 100755
--- a/spec/unit/configurer/plugin_handler_spec.rb
+++ b/spec/unit/configurer/plugin_handler_spec.rb
@@ -11,6 +11,10 @@ end
 describe Puppet::Configurer::PluginHandler do
   before do
     @pluginhandler = PluginHandlerTester.new
+
+    # PluginHandler#load_plugin has an extra-strong rescue clause
+    # this mock is to make sure that we don't silently ignore errors
+    Puppet.expects(:err).never
   end
 
   it "should have a method for downloading plugins" do
@@ -80,7 +84,7 @@ describe Puppet::Configurer::PluginHandler do
   end
 
   it "should not try to load files that don't exist" do
-    FileTest.expects(:exist?).with("foo").returns true
+    FileTest.expects(:exist?).with("foo").returns false
     @pluginhandler.expects(:load).never
 
     @pluginhandler.load_plugin("foo")