summaryrefslogtreecommitdiffstats
path: root/test/lib/puppettest/support
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-18 11:21:22 -0600
committerLuke Kanies <luke@madstop.com>2007-11-18 11:21:22 -0600
commitc19835ce9f8a5138b30a1a32ca741c996b0916d2 (patch)
tree1a7b05839f013cc8a610f7c9493e206606fab977 /test/lib/puppettest/support
parent9290cc89a2206fb5204578f8e91208857a48b147 (diff)
downloadpuppet-c19835ce9f8a5138b30a1a32ca741c996b0916d2.tar.gz
puppet-c19835ce9f8a5138b30a1a32ca741c996b0916d2.tar.xz
puppet-c19835ce9f8a5138b30a1a32ca741c996b0916d2.zip
Fixed most failing tests, but there are still over thirty failing.
At this point, I'm holding the experiment until after the release, so I'm committing this for now and will take it back up after 0.24.0 is out.
Diffstat (limited to 'test/lib/puppettest/support')
-rw-r--r--test/lib/puppettest/support/utils.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb
index d9bd6b2b6..83509733e 100644
--- a/test/lib/puppettest/support/utils.rb
+++ b/test/lib/puppettest/support/utils.rb
@@ -27,7 +27,7 @@ module PuppetTest::Support::Utils
if resources[0].is_a?(Puppet::Node::Configuration)
config = resources.shift
unless resources.empty?
- resources.each { |r| config.add_resource r }
+ resources.each { |r| config.add_resource(r) unless config.resource(r.class.name, r.title) }
end
elsif resources[0].is_a?(Puppet.type(:component))
raise ArgumentError, "resource2config() no longer accpts components"