Merge branch 'ticket/next/maint-silence_false_test_output' into next

* ticket/next/maint-silence_false_test_output:
  maint: Silence test output in the spec run

1 files changed, 3 insertions, 2 deletions

diff --git a/spec/unit/application/agent_spec.rb b/spec/unit/application/agent_spec.rb
index cc745d1fc..804057868 100755
--- a/spec/unit/application/agent_spec.rb
+++ b/spec/unit/application/agent_spec.rb
@@ -268,8 +268,9 @@ describe Puppet::Application::Agent do
     end
 
     it "should exit after printing puppet config if asked to in Puppet config" do
-      Puppet[:configprint] = "pluginsync"
-
+      Puppet[:modulepath] = '/my/path'
+      Puppet[:configprint] = "modulepath"
+      Puppet::Util::Settings.any_instance.expects(:puts).with('/my/path')
       lambda { @puppetd.setup }.should raise_error(SystemExit)
     end