Make puppetd --waitforcert option behave as documented:

"You can turn off waiting for certificates by specifying a time of 0."

Also add a test to ensure we catch any future regression of this behavior.

Signed-off-by: Paul Lathrop <paul@tertiusfamily.net>

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/unit/executables/client/certhandler.rb b/spec/unit/executables/client/certhandler.rb
index 4f8f8139c..69d6de92b 100755
--- a/spec/unit/executables/client/certhandler.rb
+++ b/spec/unit/executables/client/certhandler.rb
@@ -91,6 +91,19 @@ describe cert_handler, "when handling certificates" do
         end
     end
 
+    describe "when waitforcert is disabled" do
+        before do
+            @handler = cert_handler.new(0, false)
+            @handler.stubs(:read_cert).returns false
+        end
+
+        it "should exit if the cert request does not return a certificate" do
+            @caclient.stubs(:request_cert).returns(false)
+            @handler.expects(:exit).with(1).raises(SystemExit)
+            lambda { @handler.retrieve_cert }.should raise_error(SystemExit)
+        end
+    end
+
     describe "when in one time mode" do
         before do
             #true puts us in onetime mode