Merge pull request #8618 from chef/btm/fix-knife-exceptions

Raise knife exceptions when verbosity is 3 (-VVV)

2 files changed, 9 insertions, 6 deletions

diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb
index 2460dbaed8..48226bb344 100644
--- a/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
@@ -475,7 +475,7 @@ class Chef
         run
       end
     rescue Exception => e
-      raise if raise_exception || Chef::Config[:verbosity] == 2
+      raise if raise_exception || ( Chef::Config[:verbosity] && Chef::Config[:verbosity] >= 2 )
       humanize_exception(e)
       exit 100
     end
diff --git a/spec/unit/knife_spec.rb b/spec/unit/knife_spec.rb
index 080b2ffa29..169265c52d 100644
--- a/spec/unit/knife_spec.rb
+++ b/spec/unit/knife_spec.rb
@@ -372,11 +372,14 @@ describe Chef::Knife do
         end
       end
 
-      it "does not humanize the exception if Chef::Config[:verbosity] is two" do
-        Chef::Config[:verbosity] = 2
-        allow(knife).to receive(:run).and_raise(Exception)
-        expect(knife).not_to receive(:humanize_exception)
-        expect { knife.run_with_pretty_exceptions }.to raise_error(Exception)
+      # -VV (2) is debug, -VVV (3) is trace
+      [ 2, 3 ].each do |verbosity|
+        it "does not humanize the exception if Chef::Config[:verbosity] is #{verbosity}" do
+          Chef::Config[:verbosity] = verbosity
+          allow(knife).to receive(:run).and_raise(Exception)
+          expect(knife).not_to receive(:humanize_exception)
+          expect { knife.run_with_pretty_exceptions }.to raise_error(Exception)
+        end
       end
     end