summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-03-16 20:37:46 -0700
committerMatt Robinson <matt@puppetlabs.com>2011-03-18 14:55:04 -0700
commitcf873c63f8aad942776d27900dc35470d2508ae8 (patch)
tree5b4f8935857a2172131cf6e3a4d062220af5a0c7
parent7e71840e29cb09c772668a51ada3cab1e319e50f (diff)
downloadpuppet-cf873c63f8aad942776d27900dc35470d2508ae8.tar.gz
puppet-cf873c63f8aad942776d27900dc35470d2508ae8.tar.xz
puppet-cf873c63f8aad942776d27900dc35470d2508ae8.zip
maint: Silence test output in the spec run
There was a test that output 'false' in the middle of the spec run. This fixes that and makes the test a little stronger, because we actually assert what puts is writing to standard out. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
-rwxr-xr-xspec/unit/application/agent_spec.rb5
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