summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-12-04 17:48:41 -0800
committertyler-ball <tyleraball@gmail.com>2014-12-08 14:57:27 -0800
commit24daf0b67132bb16712513be3fe0d6f891ac9808 (patch)
tree31e7775b5e5287c665d818fbb5a1811da1bb0f59
parentdbdf7c41f4c20b0d7c3d3d8d0c72af9e2a8144b9 (diff)
downloadchef-24daf0b67132bb16712513be3fe0d6f891ac9808.tar.gz
Updating per review
-rw-r--r--lib/chef/audit/runner.rb2
-rw-r--r--lib/chef/client.rb2
-rw-r--r--lib/chef/formatters/doc.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/audit/runner.rb b/lib/chef/audit/runner.rb
index 11b1cc7d38..28ed5897d9 100644
--- a/lib/chef/audit/runner.rb
+++ b/lib/chef/audit/runner.rb
@@ -33,7 +33,7 @@ class Chef
do_run
end
- def failed_examples?
+ def audits_failed?
RSpec.world.reporter.failed_examples.size > 0
end
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 688bfa30c2..8a55f5fd90 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -358,7 +358,7 @@ class Chef
Chef::Log.info("Starting audit phase")
auditor = Chef::Audit::Runner.new(run_context)
auditor.run
- raise Chef::Exceptions::AuditsFailed if auditor.failed_examples?
+ raise Chef::Exceptions::AuditsFailed if auditor.audits_failed?
@events.audit_phase_complete
rescue Exception => e
Chef::Log.error("Audit phase failed with error message: #{e.message}")
diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb
index 4f79411ed9..c917e56588 100644
--- a/lib/chef/formatters/doc.rb
+++ b/lib/chef/formatters/doc.rb
@@ -54,7 +54,7 @@ class Chef
if Chef::Config[:why_run]
puts_line "Chef Client failed. #{@updated_resources} resources would have been updated"
else
- puts_line "Chef Client failed. #{@updated_resources} resources updated and #{successful_audits}/#{total_audits} audits succeeded in #{elapsed_time} seconds"
+ puts_line "Chef Client failed. #{@updated_resources} resources updated and #{successful_audits} audits succeeded in #{elapsed_time} seconds"
end
end