summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-09-20 12:57:57 -0500
committerLuke Kanies <luke@madstop.com>2007-09-20 12:57:57 -0500
commit46d69068fa7b2f3448294c5d3da21c69cef73d2f (patch)
tree8abf532af73d4fd7d68d894db639004e331318bc /test
parent9fa2628a844c75b8f554f283dfece01667f20594 (diff)
downloadpuppet-46d69068fa7b2f3448294c5d3da21c69cef73d2f.tar.gz
puppet-46d69068fa7b2f3448294c5d3da21c69cef73d2f.tar.xz
puppet-46d69068fa7b2f3448294c5d3da21c69cef73d2f.zip
An intermediate commit so I can start working on a different
branch. The file recursion code actually works for the first time in a painful while, but there are still some quirks and design issues to resolve, particularly around creating implicit resources that then fail (i.e., the behaviour of the create_implicit_resource method in Configuration).
Diffstat (limited to 'test')
-rwxr-xr-xtest/ral/types/file.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/ral/types/file.rb b/test/ral/types/file.rb
index 47fb87afd..b58814a7f 100755
--- a/test/ral/types/file.rb
+++ b/test/ral/types/file.rb
@@ -1283,8 +1283,6 @@ class TestFile < Test::Unit::TestCase
:content => "rahtest",
:backup => false
)
-
- Puppet[:evaltrace] = true
destobj = Puppet::Type.newfile(:title => "destdir", :path => destdir,
:source => sourcedir,
@@ -1299,6 +1297,7 @@ class TestFile < Test::Unit::TestCase
assert(FileTest.exists?(purgee), "File got prematurely purged")
assert_nothing_raised { destobj[:purge] = true }
+ Puppet.err :yay
config.apply
assert(FileTest.exists?(localfile), "Local file got purged")
@@ -1755,7 +1754,6 @@ class TestFile < Test::Unit::TestCase
assert_nothing_raised("Failure when recursing") do
children = obj.eval_generate
end
- config.add_resource(*children)
assert(obj.class[subdir], "did not create subdir object")
children.each do |c|
assert_nothing_raised("Failure when recursing on %s" % c) do