Fixing #588 - the parser correctly ignores directories in globbing now

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

1 files changed, 16 insertions, 0 deletions

diff --git a/test/language/parser.rb b/test/language/parser.rb
index b01720e08..14e27d86b 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -747,6 +747,22 @@ file { "/tmp/yayness":
             parser.parse("$one::two = yay")
         end
     end
+
+    # #588
+    def test_globbing_with_directories
+        dir = tempfile
+        Dir.mkdir(dir)
+        subdir = File.join(dir, "subdir")
+        Dir.mkdir(subdir)
+        file = File.join(dir, "file.pp")
+        maker = tempfile
+        File.open(file, "w") { |f| f.puts "file { '#{maker}': ensure => file }" }
+
+        parser = mkparser
+        assert_nothing_raised("Globbing failed when it matched a directory") do
+            parser.import("%s/*" % dir)
+        end
+    end
 end
 
 # $Id$