summaryrefslogtreecommitdiffstats
path: root/test/ral
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-07-23 16:51:22 -0700
committerJames Turnbull <james@lovedthanlost.net>2009-07-25 12:00:02 +1000
commitb3b76dffdd9cd8ed5c3d0230624bf05015bec5b8 (patch)
tree169d9be6b86aa460f1a563c2821874ddb12cc974 /test/ral
parent9120712f97c12dad0c743271b4f64cf545319b69 (diff)
downloadpuppet-b3b76dffdd9cd8ed5c3d0230624bf05015bec5b8.tar.gz
puppet-b3b76dffdd9cd8ed5c3d0230624bf05015bec5b8.tar.xz
puppet-b3b76dffdd9cd8ed5c3d0230624bf05015bec5b8.zip
Fixing #2296 - overlapping recursions work again
This fixes the behaviour when you have file recursions that overlap - we again correctly use the most specific information. It's still a bit expensive when you do this, but at least it behaves correctly, and it should be a rare circumstance. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'test/ral')
-rwxr-xr-xtest/ral/type/file.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/ral/type/file.rb b/test/ral/type/file.rb
index 829310ed4..7d6ec659f 100755
--- a/test/ral/type/file.rb
+++ b/test/ral/type/file.rb
@@ -5,6 +5,7 @@ require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'puppettest'
require 'puppettest/support/utils'
require 'fileutils'
+require 'mocha'
class TestFile < Test::Unit::TestCase
include PuppetTest::Support::Utils