diff options
| -rwxr-xr-x | lib/puppet/network/handler/fileserver.rb | 1 | ||||
| -rwxr-xr-x | test/network/handler/fileserver.rb | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb index 5ba507b16..7726019ba 100755 --- a/lib/puppet/network/handler/fileserver.rb +++ b/lib/puppet/network/handler/fileserver.rb @@ -5,6 +5,7 @@ require 'cgi' require 'delegate' class Puppet::Network::Handler + AuthStoreError = Puppet::AuthStoreError class FileServerError < Puppet::Error; end class FileServer < Handler desc "The interface to Puppet's fileserving abilities." diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb index 1328a7cea..339c96bde 100755 --- a/test/network/handler/fileserver.rb +++ b/test/network/handler/fileserver.rb @@ -1124,6 +1124,28 @@ allow * 'allow.example.com', "192.168.0.1") } end + + # Make sure we successfully throw errors -- someone ran into this with + # 0.22.4. + def test_failures + # create a server with the file + server = nil + + config = tempfile + [ + "[this is invalid]\nallow one.two.com", # invalid name + "[valid]\nallow *.testing something.com", # invalid allow + "[valid]\nallow one.two.com\ndeny *.testing something.com", # invalid deny + ].each do |failer| + File.open(config, "w") { |f| f.puts failer } + assert_raise(Puppet::Network::Handler::FileServerError, "Did not fail on %s" % failer.inspect) { + server = Puppet::Network::Handler::FileServer.new( + :Local => false, + :Config => config + ) + } + end + end end # $Id$ |