Allowing dashes in class names, although grammar rules restrict it from working anywhere except node names or in tag(). They are valid in host names, and many companies have them in the host names; in fact, this fix is for a company with this exact problem -- they cannot use puppet with their nodes because all their hosts have dashes in the host names.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1165 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 2 insertions, 2 deletions

diff --git a/test/language/scope.rb b/test/language/scope.rb
index da23c4256..62cded121 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -550,13 +550,13 @@ class TestScope < Test::Unit::TestCase
     def test_validclassnames
         scope = Puppet::Parser::Scope.new()
 
-        ["a-class", "a class", "Class", "a.class"].each do |bad|
+        ["a class", "Class", "a.class"].each do |bad|
             assert_raise(Puppet::ParseError, "Incorrectly allowed %s" % bad.inspect) do
                 scope.setclass(object_id, bad)
             end
         end
 
-        ["a_class", "class", "yayNess"].each do |good|
+        ["a-class", "a_class", "class", "yayNess"].each do |good|
             assert_nothing_raised("Incorrectly banned %s" % good.inspect) do
                 scope.setclass(object_id, good)
             end