summaryrefslogtreecommitdiffstats
path: root/spec/unit/application/puppetmasterd.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-05-09 13:40:59 -0700
committerLuke Kanies <luke@madstop.com>2009-05-27 10:57:45 -0500
commite0c19f99f44d94715984d5533daed25e35ac6f3b (patch)
treefd454912283626c4bcb6cd4e05a02d2116d8b96c /spec/unit/application/puppetmasterd.rb
parentab34cf610ee529fcbbf777aae7b382090af1a8b2 (diff)
downloadpuppet-e0c19f99f44d94715984d5533daed25e35ac6f3b.tar.gz
puppet-e0c19f99f44d94715984d5533daed25e35ac6f3b.tar.xz
puppet-e0c19f99f44d94715984d5533daed25e35ac6f3b.zip
Fixing #2228 - --logdest works again in puppetd and puppetmasterd
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'spec/unit/application/puppetmasterd.rb')
-rw-r--r--spec/unit/application/puppetmasterd.rb18
1 files changed, 18 insertions, 0 deletions
diff --git a/spec/unit/application/puppetmasterd.rb b/spec/unit/application/puppetmasterd.rb
index 59377abb0..000b2d602 100644
--- a/spec/unit/application/puppetmasterd.rb
+++ b/spec/unit/application/puppetmasterd.rb
@@ -75,6 +75,16 @@ describe "PuppetMaster" do
end
describe "when applying options" do
+ before do
+ @old_argv = ARGV.dup
+ ARGV.clear
+ end
+
+ after do
+ ARGV.clear
+ @old_argv.each { |a| ARGV << a }
+ end
+
it "should set the log destination with --logdest" do
Puppet::Log.expects(:newdestination).with("console")
@@ -86,6 +96,14 @@ describe "PuppetMaster" do
@puppetmasterd.handle_logdest("console")
end
+
+ it "should parse the log destination from ARGV" do
+ ARGV << "--logdest" << "/my/file"
+
+ Puppet::Util::Log.expects(:newdestination).with("/my/file")
+
+ @puppetmasterd.parse_options
+ end
end
describe "during setup" do