diff options
| author | Ben Hughes <ben@puppetlabs.com> | 2011-04-05 16:19:01 +1000 |
|---|---|---|
| committer | Ben Hughes <ben@puppetlabs.com> | 2011-06-03 11:27:27 -0700 |
| commit | 16b2311256a142a69cb9ddadf29eea804b281e1c (patch) | |
| tree | 87b3d25aad06b0ca40be3750c3ac8eb687b65221 | |
| parent | 17f673dd6fee08309970f8ff721855cf1644b45f (diff) | |
| download | puppet-16b2311256a142a69cb9ddadf29eea804b281e1c.tar.gz puppet-16b2311256a142a69cb9ddadf29eea804b281e1c.tar.xz puppet-16b2311256a142a69cb9ddadf29eea804b281e1c.zip | |
(#6885) puppet agent fingerprint requires --verbose to return a value.
Always output the fingerprint to STDOUT, no matter what loglevel is used,
as that's the whole purpose of the comment.
Having to specify --verbose in addition to --fingerprint to get the finger
is nonsensical.
Update the spec test to stub @puppet puts, instead of the
Puppet.logging facilities.
Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
| -rw-r--r-- | lib/puppet/application/agent.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/application/agent_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb index 3749241f8..53e083232 100644 --- a/lib/puppet/application/agent.rb +++ b/lib/puppet/application/agent.rb @@ -98,7 +98,7 @@ class Puppet::Application::Agent < Puppet::Application unless fingerprint = cert.fingerprint(options[:digest]) raise ArgumentError, "Could not get fingerprint for digest '#{options[:digest]}'" end - Puppet.notice fingerprint + puts fingerprint end def onetime diff --git a/spec/unit/application/agent_spec.rb b/spec/unit/application/agent_spec.rb index 8f498d4ba..9cc32bbb5 100755 --- a/spec/unit/application/agent_spec.rb +++ b/spec/unit/application/agent_spec.rb @@ -563,7 +563,7 @@ describe Puppet::Application::Agent do @host.stubs(:certificate).returns(@cert) @cert.stubs(:fingerprint).with(:MD5).returns("DIGEST") - Puppet.expects(:notice).with("DIGEST") + @puppetd.expects(:puts).with "DIGEST" @puppetd.fingerprint end |