summaryrefslogtreecommitdiffstats
path: root/spec/unit
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-02-25 19:53:24 -0500
committerLuke Kanies <luke@madstop.com>2008-02-25 19:53:24 -0500
commit42bfdf2fc7affa91265043e583c9673b738d22dd (patch)
tree999b959a94738e00401566ef50ed3ac4dfb6af52 /spec/unit
parent125851278d745e443c0598fbb0577b010f824365 (diff)
downloadpuppet-42bfdf2fc7affa91265043e583c9673b738d22dd.tar.gz
puppet-42bfdf2fc7affa91265043e583c9673b738d22dd.tar.xz
puppet-42bfdf2fc7affa91265043e583c9673b738d22dd.zip
Fixing #1085, I think -- I was not returning a resource
if the class had already been evaluated, but this was only being run into in corner cases -- mostly where one class included another class, I assume.
Diffstat (limited to 'spec/unit')
-rwxr-xr-xspec/unit/parser/ast/hostclass.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/spec/unit/parser/ast/hostclass.rb b/spec/unit/parser/ast/hostclass.rb
index a53c3b092..0abc174d9 100755
--- a/spec/unit/parser/ast/hostclass.rb
+++ b/spec/unit/parser/ast/hostclass.rb
@@ -42,6 +42,12 @@ describe Puppet::Parser::AST::HostClass do
@top.evaluate(@scope)
end
+ it "should return the existing resource when not creating a new one" do
+ @compiler.catalog.expects(:resource).with(:class, "top").returns("something")
+ @compiler.catalog.expects(:add_resource).never
+ @top.evaluate(@scope).should == "something"
+ end
+
it "should not create a new parent resource if one already exists and it has a parent class" do
@top.evaluate(@scope)
@@ -126,4 +132,4 @@ describe Puppet::Parser::AST::HostClass do
@compiler.class_scope(@middle).namespaces.should be_include(@top.namespace)
end
end
-end \ No newline at end of file
+end