diff options
| author | Luke Kanies <luke@madstop.com> | 2008-10-08 22:03:22 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-10-08 22:03:22 -0500 |
| commit | 53b7d42bb061ff1cfea3519179779a1cba2cf877 (patch) | |
| tree | 4a6156ca94f381b6340b820700fecfb61c72b67b | |
| parent | 5ec6b0734d5656dbfcf89320d476e0aeeec500f5 (diff) | |
| download | puppet-53b7d42bb061ff1cfea3519179779a1cba2cf877.tar.gz puppet-53b7d42bb061ff1cfea3519179779a1cba2cf877.tar.xz puppet-53b7d42bb061ff1cfea3519179779a1cba2cf877.zip | |
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@madstop.com>
| -rw-r--r-- | lib/puppet/network/handler/master.rb | 2 | ||||
| -rwxr-xr-x | test/network/handler/master.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb index 05ae7b9a2..71b633a09 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 d342af88c..654404ae5 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 |