diff options
| -rw-r--r-- | lib/puppet/network/client/master.rb | 10 | ||||
| -rwxr-xr-x | test/network/client/master.rb | 18 |
2 files changed, 24 insertions, 4 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index e358a1d55..6db2e98c7 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -483,11 +483,11 @@ class Puppet::Network::Client::Master < Puppet::Network::Client end def self.timeout - @timeout = Puppet[:configtimeout] - case @timeout + timeout = Puppet[:configtimeout] + case timeout when String: - if @timeout =~ /^\d+$/ - @timeout = Integer(@timeout) + if timeout =~ /^\d+$/ + timeout = Integer(timeout) else raise ArgumentError, "Configuration timeout must be an integer" end @@ -495,6 +495,8 @@ class Puppet::Network::Client::Master < Puppet::Network::Client else raise ArgumentError, "Configuration timeout must be an integer" end + + return timeout end # Send off the transaction report. diff --git a/test/network/client/master.rb b/test/network/client/master.rb index c53e292c8..ffdb8a0ce 100755 --- a/test/network/client/master.rb +++ b/test/network/client/master.rb @@ -622,6 +622,24 @@ end assert(! master.send(:lockfile).locked?, "Master is still locked after failure") end + + # Make sure we get a value for timeout + def test_config_timeout + master = Puppet::Network::Client.client(:master) + time = Integer(Puppet[:configtimeout]) + assert_equal(time, master.timeout, "Did not get default value for timeout") + assert_equal(time, master.timeout, "Did not get default value for timeout on second run") + + # Reset it + Puppet[:configtimeout] = "50" + assert_equal(50, master.timeout, "Did not get changed default value for timeout") + assert_equal(50, master.timeout, "Did not get changed default value for timeout on second run") + + # Now try an integer + Puppet[:configtimeout] = 100 + assert_equal(100, master.timeout, "Did not get changed integer default value for timeout") + assert_equal(100, master.timeout, "Did not get changed integer default value for timeout on second run") + end end # $Id$ |