diff options
| -rwxr-xr-x | lib/puppet/daemon.rb | 1 | ||||
| -rw-r--r-- | test/server/server.rb | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb index 508c79efa..edcd5f50d 100755 --- a/lib/puppet/daemon.rb +++ b/lib/puppet/daemon.rb @@ -216,6 +216,7 @@ module Puppet # Create the pid file. def setpidfile + return unless Puppet[:setpidfile] Puppet.config.use(:puppet) @pidfile = self.pidfile if FileTest.exists?(@pidfile) diff --git a/test/server/server.rb b/test/server/server.rb index 2c3489fb5..e05a28bec 100644 --- a/test/server/server.rb +++ b/test/server/server.rb @@ -122,4 +122,31 @@ class TestServer < Test::Unit::TestCase retval = client.getconfig } end + + def test_setpidfile_setting + Puppet[:setpidfile] = false + server = nil + assert_nothing_raised() { + server = Puppet::Server.new( + :Port => @@port, + :Handlers => { + :CA => {}, # so that certs autogenerate + :Status => nil + } + ) + + } + + assert_nothing_raised { + server.setpidfile + } + + assert(! FileTest.exists?(server.pidfile), "PID file was created") + Puppet[:setpidfile] = true + + assert_nothing_raised { + server.setpidfile + } + assert(FileTest.exists?(server.pidfile), "PID file was not created") + end end |