From 6bcfd9f021be13bfd3269eaa72bc289eab37a64f Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Fri, 3 Oct 2008 13:11:44 -0500 Subject: Fixing #947 - pluginsync no longer fails poorly when no plugins exist Note that it still fails -- it's just a more reasonable failure. Signed-off-by: Luke Kanies --- test/network/handler/fileserver.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test/network/handler') diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb index a705dbf4b..873657e5d 100755 --- a/test/network/handler/fileserver.rb +++ b/test/network/handler/fileserver.rb @@ -437,6 +437,14 @@ class TestFileServer < Test::Unit::TestCase assert_nil(retval, "Description of non-existent mounts returned a value") end + def test_describe_does_not_fail_when_mount_does_not_find_file + server = Puppet::Network::Handler.fileserver.new(:Local => true, :Config => false) + + assert_nothing_raised("Failed when describing missing plugins") do + server.describe "/plugins" + end + end + # test that our config file is parsing and working as planned def test_configfile server = nil -- cgit From 53b7d42bb061ff1cfea3519179779a1cba2cf877 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 8 Oct 2008 22:03:22 -0500 Subject: 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 --- test/network/handler/master.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test/network/handler') 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 -- cgit