Merge branch '0.24.x'

2 files changed, 6 insertions, 1 deletions

diff --git a/test/ral/providers/package.rb b/test/ral/providers/package.rb
index 90c862178..f2d28d0f0 100755
--- a/test/ral/providers/package.rb
+++ b/test/ral/providers/package.rb
@@ -46,7 +46,7 @@ class TestPackageProvider < Test::Unit::TestCase
         end
         facts = {}
         Facter.to_hash.each do |fact, value|
-            facts[fact.downcase.intern] = value.downcase.intern
+            facts[fact.to_s.downcase.intern] = value.to_s.downcase.intern
         end
         list.find_all { |hash| # First find the matching providers
             hash.include?(:provider) and providers.include?(hash[:provider])
diff --git a/test/ral/types/file.rb b/test/ral/types/file.rb
index a3a0c579a..aa2e63a89 100755
--- a/test/ral/types/file.rb
+++ b/test/ral/types/file.rb
@@ -1817,5 +1817,10 @@ class TestFile < Test::Unit::TestCase
         changes = obj.evaluate
         assert(changes.empty?, "Missing file with no ensure resulted in changes")
     end
+
+    def test_root_dir_is_named_correctly
+        obj = Puppet::Type.newfile(:path => '/', :mode => 0755)
+        assert_equal("/", obj.title, "/ directory was changed to empty string")
+    end
 end