diff options
| -rw-r--r-- | lib/chef/shell.rb | 4 | ||||
| -rw-r--r-- | spec/functional/shell_spec.rb | 53 |
2 files changed, 56 insertions, 1 deletions
diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb index 0390cfaac5..4c86f96616 100644 --- a/lib/chef/shell.rb +++ b/lib/chef/shell.rb @@ -76,6 +76,8 @@ module Shell def self.setup_logger Chef::Config[:log_level] ||= :warn + # If log_level is auto, change it to warn + Chef::Config[:log_level] = :warn if Chef::Config[:log_level] == :auto Chef::Log.init(STDERR) Mixlib::Authentication::Log.logger = Ohai::Log.logger = Chef::Log.logger Chef::Log.level = Chef::Config[:log_level] || :warn @@ -229,7 +231,7 @@ FOOTER :short => "-l LOG_LEVEL", :long => '--log-level LOG_LEVEL', :description => "Set the logging level", - :proc => proc { |level| Chef::Log.level = level.to_sym } + :proc => proc { |level| Chef::Config.log_level = level.to_sym; Shell.setup_logger } option :standalone, :short => "-a", diff --git a/spec/functional/shell_spec.rb b/spec/functional/shell_spec.rb new file mode 100644 index 0000000000..956acc188b --- /dev/null +++ b/spec/functional/shell_spec.rb @@ -0,0 +1,53 @@ +# +# Author:: Daniel DeLeo (<dan@opscode.com>) +# Copyright:: Copyright (c) 2012 Opscode, Inc. +# License:: Apache License, Version 2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +require 'spec_helper' +require 'pty' + +describe Chef::Shell do + + # chef-shell's unit tests are by necessity very mock-heavy, and frequently do + # not catch cases where chef-shell fails to boot because of changes in + # chef/client.rb + describe "smoke tests", :unix_only => true do + + def run_chef_shell_with(options) + reader, writer, pid = PTY.spawn("bin/chef-shell #{options}") + yield writer if block_given? + writer.puts("exit") + output = reader.read + exitstatus = Process.waitpid2(pid)[1] + [output, exitstatus] + end + + it "boots correctly with -lauto" do + output, exitstatus = run_chef_shell_with("-lauto") + exitstatus.should be_success + end + + it "sets the log_level from the command line" do + output, exitstatus = run_chef_shell_with("-lfatal") do |shell| + shell.puts(%Q[puts "===\#\{Chef::Log.level}==="]) + end + output.should include("===fatal===") + exitstatus.should be_success + end + + end + +end |