From a40e9b7dc58eef2e965e81f6c7be2dc7c14910d9 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Tue, 18 Mar 2008 18:16:03 -0500 Subject: Fixing some tests that only failed under certain circumstances (mostly, when loaded with other files, or when loaded from rake or autotest rather than separately). --- spec/unit/parser/resource.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'spec/unit/parser') diff --git a/spec/unit/parser/resource.rb b/spec/unit/parser/resource.rb index 1948a3c07..776e9c742 100755 --- a/spec/unit/parser/resource.rb +++ b/spec/unit/parser/resource.rb @@ -257,9 +257,7 @@ describe Puppet::Parser::Resource do it "should fail when the override was not created by a parent class" do @override.source = "source2" @override.source.expects(:child_of?).with("source1").returns(false) - assert_raise(Puppet::ParseError, "Allowed unrelated resources to override") do - @resource.merge(@override) - end + lambda { @resource.merge(@override) }.should raise_error(Puppet::ParseError) end it "should succeed when the override was created in the current scope" do -- cgit