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

1 files changed, 5 insertions, 15 deletions

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