Adding number failed to exception

3 files changed, 14 insertions, 4 deletions

diff --git a/lib/chef/audit/runner.rb b/lib/chef/audit/runner.rb
index 28ed5897d9..e15b3103f8 100644
--- a/lib/chef/audit/runner.rb
+++ b/lib/chef/audit/runner.rb
@@ -33,10 +33,18 @@ class Chef
         do_run
       end
 
-      def audits_failed?
+      def failed?
         RSpec.world.reporter.failed_examples.size > 0
       end
 
+      def num_failed
+        RSpec.world.reporter.failed_examples.size
+      end
+
+      def num_total
+        RSpec.world.reporter.examples.size
+      end
+
       private
       # Prepare to run audits:
       #  - Require files
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 8a55f5fd90..634773cf80 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -358,7 +358,9 @@ class Chef
         Chef::Log.info("Starting audit phase")
         auditor = Chef::Audit::Runner.new(run_context)
         auditor.run
-        raise Chef::Exceptions::AuditsFailed if auditor.audits_failed?
+        if auditor.failed?
+          raise Chef::Exceptions::AuditsFailed.new(auditor.num_failed, auditor.num_total)
+        end
         @events.audit_phase_complete
       rescue Exception => e
         Chef::Log.error("Audit phase failed with error message: #{e.message}")
diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb
index 0aae8d9484..ef957ec502 100644
--- a/lib/chef/exceptions.rb
+++ b/lib/chef/exceptions.rb
@@ -391,8 +391,8 @@ class Chef
       end
     end
     class AuditsFailed < RuntimeError
-      def initialize
-        super "There were audit example failures. Results were still sent to the server."
+      def initialize(num_failed, num_total)
+        super "Audit phase found failures - #{num_failed}/#{num_total} audits failed"
       end
     end