diff options
| author | Luke Kanies <luke@madstop.com> | 2008-12-09 15:33:28 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-12-18 11:10:21 -0600 |
| commit | d48fff6658535ca1781443aba9ab21893c13e55c (patch) | |
| tree | 4fcfd8b502a0f23f057a6e0695f466195978f366 /test/lib | |
| parent | c927ce05bbd96fa9aacc8e52f8eb797403a1e433 (diff) | |
Renaming Puppet::Node::Catalog to Puppet::Resource::Catalog
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'test/lib')
| -rwxr-xr-x | test/lib/puppettest/support/resources.rb | 2 | ||||
| -rw-r--r-- | test/lib/puppettest/support/utils.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/lib/puppettest/support/resources.rb b/test/lib/puppettest/support/resources.rb index 255c55569..045579302 100755 --- a/test/lib/puppettest/support/resources.rb +++ b/test/lib/puppettest/support/resources.rb @@ -25,7 +25,7 @@ module PuppetTest::Support::Resources end def mktree - catalog = Puppet::Node::Catalog.new do |config| + catalog = Puppet::Resource::Catalog.new do |config| one = treenode(config, "one", "a", "b") two = treenode(config, "two", "c", "d") middle = treenode(config, "middle", "e", "f", two) diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb index 0d775d184..aa3ad8b8d 100644 --- a/test/lib/puppettest/support/utils.rb +++ b/test/lib/puppettest/support/utils.rb @@ -24,7 +24,7 @@ module PuppetTest::Support::Utils # Turn a list of resources, or possibly a catalog and some resources, # into a catalog object. def resources2catalog(*resources) - if resources[0].is_a?(Puppet::Node::Catalog) + if resources[0].is_a?(Puppet::Resource::Catalog) config = resources.shift unless resources.empty? resources.each { |r| config.add_resource r } @@ -34,7 +34,7 @@ module PuppetTest::Support::Utils comp = resources.shift comp.delve else - config = Puppet::Node::Catalog.new + config = Puppet::Resource::Catalog.new resources.each { |res| config.add_resource res } end return config @@ -159,7 +159,7 @@ module PuppetTest::Support::Utils else name = :testing end - config = Puppet::Node::Catalog.new :testing do |conf| + config = Puppet::Resource::Catalog.new :testing do |conf| resources.each { |resource| conf.add_resource resource } end |