fixing some problems with the config timeout -- I am not sure it ever actually worked

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2512 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 18 insertions, 0 deletions

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$