summaryrefslogtreecommitdiffstats
path: root/spec/unit
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-03-06 15:02:38 -0600
committerLuke Kanies <luke@madstop.com>2008-03-06 15:02:38 -0600
commit77fe8990072c8d068aabd5958d14382e21be8860 (patch)
tree35365b21989bd85bbbcb227c666a63d05c378ef0 /spec/unit
parentdade15302f899b75426b6e32dd4b1aa2371bf4fc (diff)
parent4c0f6c8502a0759519877f3e933e44ba980f7da2 (diff)
downloadpuppet-77fe8990072c8d068aabd5958d14382e21be8860.tar.gz
puppet-77fe8990072c8d068aabd5958d14382e21be8860.tar.xz
puppet-77fe8990072c8d068aabd5958d14382e21be8860.zip
Merge commit 'andrew/0.24.x' into 0.24.x
Diffstat (limited to 'spec/unit')
-rwxr-xr-xspec/unit/node/catalog.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/unit/node/catalog.rb b/spec/unit/node/catalog.rb
index 604dabbb6..360dd87f2 100755
--- a/spec/unit/node/catalog.rb
+++ b/spec/unit/node/catalog.rb
@@ -304,6 +304,8 @@ describe Puppet::Node::Catalog, " when converting to a RAL catalog" do
resource = stub 'resource', :name => "changer2", :title => "changer2", :ref => "Test[changer2]", :catalog= => nil, :remove => nil
+ #changer is going to get duplicated as part of a fix for aliases 1094
+ changer.expects(:dup).returns(changer)
changer.expects(:to_type).returns(resource)
newconfig = nil