diff options
| author | Luke Kanies <luke@madstop.com> | 2008-10-17 09:01:04 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-10-17 09:01:04 -0500 |
| commit | 8aee40de69e6fe8d67ab58a2e223443b15820584 (patch) | |
| tree | 89e230df3b43302a542f2cb6869f63e2fb93f6d8 /test/network/handler/master.rb | |
| parent | 1b517d2fb048603bd1743a662bde74e8ae4b13dc (diff) | |
| parent | a74ec60d33dee1c592ec858faeccc23d7a7b79f3 (diff) | |
| download | puppet-8aee40de69e6fe8d67ab58a2e223443b15820584.tar.gz puppet-8aee40de69e6fe8d67ab58a2e223443b15820584.tar.xz puppet-8aee40de69e6fe8d67ab58a2e223443b15820584.zip | |
Merge branch '0.24.x' Removed the 'after' blocks that call Type.clear,
since that method is deprecated.
Conflicts:
CHANGELOG
bin/puppetca
lib/puppet/file_serving/fileset.rb
lib/puppet/network/xmlrpc/client.rb
lib/puppet/type/file/selcontext.rb
spec/unit/file_serving/metadata.rb
spec/unit/type/file.rb
Diffstat (limited to 'test/network/handler/master.rb')
| -rwxr-xr-x | test/network/handler/master.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb index bbdc021b9..0de38414a 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 |