diff options
-rw-r--r-- | lib/puppet/application/agent.rb | 5 | ||||
-rwxr-xr-x | spec/unit/application/agent.rb | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb index ec6fc8088..487b076de 100644 --- a/lib/puppet/application/agent.rb +++ b/lib/puppet/application/agent.rb @@ -108,7 +108,10 @@ Puppet::Application.new(:agent) do exit(1) return end - Puppet.notice cert.fingerprint(options[:digest]) + unless fingerprint = cert.fingerprint(options[:digest]) + raise ArgumentError, "Could not get fingerprint for digest '#{options[:digest]}'" + end + Puppet.notice fingerprint end command(:onetime) do diff --git a/spec/unit/application/agent.rb b/spec/unit/application/agent.rb index cbfd2d72a..782dcfca5 100755 --- a/spec/unit/application/agent.rb +++ b/spec/unit/application/agent.rb @@ -564,14 +564,14 @@ describe Puppet::Application[:agent] do it "should fingerprint the certificate if it exists" do @host.expects(:certificate).returns(@cert) - @cert.expects(:fingerprint).with(:MD5) + @cert.expects(:fingerprint).with(:MD5).returns "fingerprint" @puppetd.fingerprint end it "should fingerprint the certificate request if no certificate have been signed" do @host.expects(:certificate).returns(nil) @host.expects(:certificate_request).returns(@cert) - @cert.expects(:fingerprint).with(:MD5) + @cert.expects(:fingerprint).with(:MD5).returns "fingerprint" @puppetd.fingerprint end |