From c9de332e8ab75f234d79e2dc8a3fcd2949a1f224 Mon Sep 17 00:00:00 2001 From: luke Date: Mon, 30 Apr 2007 21:08:06 +0000 Subject: Fixing the fileserver naming tests after the change to allow "-" in fileserver module names. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2443 980ebf18-57e1-0310-9a29-db15c13687c0 --- test/network/handler/fileserver.rb | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'test/network/handler') diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb index 4c5af8a9a..1328a7cea 100755 --- a/test/network/handler/fileserver.rb +++ b/test/network/handler/fileserver.rb @@ -78,21 +78,11 @@ class TestFileServer < Test::Unit::TestCase ) } - assert_raise(Puppet::Network::Handler::FileServerError) { - server.mount("/tmp", "invalid+name") - } - - assert_raise(Puppet::Network::Handler::FileServerError) { - server.mount("/tmp", "invalid-name") - } - - assert_raise(Puppet::Network::Handler::FileServerError) { - server.mount("/tmp", "invalid name") - } - - assert_raise(Puppet::Network::Handler::FileServerError) { - server.mount("/tmp", "") - } + [" ", "=" "+", "&", "#", "*"].each do |char| + assert_raise(Puppet::Network::Handler::FileServerError, "'%s' did not throw a failure in fileserver module names" % char) { + server.mount("/tmp", "invalid%sname" % char) + } + end end # verify that listing the root behaves as expected -- cgit