[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[Luke Kanies]

The following commit has been merged in the master branch:
commit 53b7d42bb061ff1cfea3519179779a1cba2cf877
Author: Luke Kanies <luke at madstop.com>
Date:   Wed Oct 8 22:03:22 2008 -0500

    Fixing the broken tests resulting from the fix for #1551.
    
    The test was expecting the current time, albeit as an integer.
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 05ae7b9..71b633a 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -24,7 +24,7 @@ class Puppet::Network::Handler
         # Tell a client whether there's a fresh config for it
         def freshness(client = nil, clientip = nil)
             # Always force a recompile.  Newer clients shouldn't do this (as of April 2008).
-            return 0
+            return Time.now.to_i
         end
 
         def initialize(hash = {})
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index d342af8..654404a 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -25,7 +25,9 @@ class TestMaster < Test::Unit::TestCase
         now1 = mock 'now1'
         Time.expects(:now).returns(now1)
 
-        assert_equal(@master.freshness, now1, "Did not return current time as freshness")
+        now1.expects(:to_i).returns 10
+
+        assert_equal(@master.freshness, 10, "Did not return current time as freshness")
     end
 
     def test_hostname_is_used_if_client_is_missing

-- 
Puppet packaging for Debian