From fc2904955ca6e77bda8719671df200e0811c38cd Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Wed, 12 May 2010 18:16:29 -0700 Subject: feature #2276 Single Executable: use new names for settings sections The puppet-internal settings sections aren't actually exposed to the user, but to reduce confusion I've renamed them to be consistent with the single-executable application names. Signed-off-by: Jesse Wolfe --- spec/unit/application/agent.rb | 2 +- spec/unit/application/master.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/unit/application') diff --git a/spec/unit/application/agent.rb b/spec/unit/application/agent.rb index fcf01e071..598492bc7 100755 --- a/spec/unit/application/agent.rb +++ b/spec/unit/application/agent.rb @@ -298,7 +298,7 @@ describe Puppet::Application::Agent do end it "should use :main, :puppetd, and :ssl" do - Puppet.settings.expects(:use).with(:main, :puppetd, :ssl) + Puppet.settings.expects(:use).with(:main, :agent, :ssl) @puppetd.setup end diff --git a/spec/unit/application/master.rb b/spec/unit/application/master.rb index ff0c1994c..54336c10e 100644 --- a/spec/unit/application/master.rb +++ b/spec/unit/application/master.rb @@ -170,8 +170,8 @@ describe Puppet::Application::Master do lambda { @master.setup }.should raise_error(SystemExit) end - it "should tell Puppet.settings to use :main,:ssl and :puppetmasterd category" do - Puppet.settings.expects(:use).with(:main,:puppetmasterd,:ssl) + it "should tell Puppet.settings to use :main,:ssl and :master category" do + Puppet.settings.expects(:use).with(:main,:master,:ssl) @master.setup end -- cgit