From 8465cd08d0e522c8ef871df7d3a5bf216e1d7d59 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Fri, 26 Mar 2010 17:02:14 -0700 Subject: Resolving conflicts with reinh:feature/master/single_executable Puppet is now main, and the variable got renamed to reflect that. --- spec/unit/application/main.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/unit/application/main.rb b/spec/unit/application/main.rb index 497ee6b5e..ef9626766 100755 --- a/spec/unit/application/main.rb +++ b/spec/unit/application/main.rb @@ -232,7 +232,7 @@ describe "Puppet" do it "should raise an error if we can't find the node" do Puppet::Node::Facts.expects(:find).returns(nil) - lambda { @puppet.main }.should raise_error + lambda { @main.main }.should raise_error end it "should find the node" do -- cgit