summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-01 21:33:02 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-01 21:33:02 +0000
commit4482691e4151663660a120ff1d053d3d43bb3faf (patch)
tree86dd9b514660f000cd4ced840df6f06638463441 /test
parent3e933cc6799f3cc62421109f7c998d2828adbf9a (diff)
Fixing some failing tests on fedora.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2011 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test')
-rwxr-xr-xtest/types/file.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/types/file.rb b/test/types/file.rb
index cebdac636..80e2563d8 100755
--- a/test/types/file.rb
+++ b/test/types/file.rb
@@ -529,7 +529,8 @@ class TestFile < Test::Unit::TestCase
File.open(f, "w") do |o| o.puts "" end
end
assert_nothing_raised() { ret = dir.localrecurse(true) }
- assert_equal(files.sort, ret.collect { |f| f.title }, "child object was returned twice")
+ assert_equal(files.sort, ret.collect { |f| f.title }.sort,
+ "child object was returned twice")
# Clean everything up and start over
files << test
@@ -801,7 +802,7 @@ class TestFile < Test::Unit::TestCase
assert(file, "Could not retrieve file object")
- assert_equal("file=%s" % file.title, file.path)
+ assert_equal("/%s" % file.ref, file.path)
end
def test_autorequire
@@ -1133,7 +1134,7 @@ class TestFile < Test::Unit::TestCase
end
assert_nothing_raised { ret = link.linkrecurse(true) }
- assert_equal(returns.sort, ret.collect { |f| f.title },
+ assert_equal(returns.sort, ret.collect { |f| f.title }.sort,
"Did not get links back")
returns.each do |path|