diff options
| author | Markus Roberts <Markus@reality.com> | 2010-03-26 17:02:14 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 8465cd08d0e522c8ef871df7d3a5bf216e1d7d59 (patch) | |
| tree | 3f7c5671e128238b2228411d34be8ad6dfdfd2f1 | |
| parent | 0f768ed335424253b8f1f66788a076f451b37170 (diff) | |
| download | puppet-8465cd08d0e522c8ef871df7d3a5bf216e1d7d59.tar.gz puppet-8465cd08d0e522c8ef871df7d3a5bf216e1d7d59.tar.xz puppet-8465cd08d0e522c8ef871df7d3a5bf216e1d7d59.zip | |
Resolving conflicts with reinh:feature/master/single_executable
Puppet is now main, and the variable got renamed to reflect that.
| -rwxr-xr-x | spec/unit/application/main.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |