Merge pull request #1135 from chef/tm/bad_tests_2

fix critical plugin tests

spec/unit/system_spec.rb

@@ -213,19 +213,22 @@
       end
 
       describe "when using :critical_plugins" do
+        # if called from cli is true, we'll exit these tests
+        let(:ohai) { Ohai::System.new() }
+
         before do
           Ohai.config[:critical_plugins] = [ :Fails ]
         end
+
         after do
           Ohai.config[:critical_plugins] = []
         end
 
         it "should fail when critical plugins fail" do
           Ohai.config[:plugin_path] = [ path_to(".") ]
-          expect(Ohai::Log).to receive(:error).with(/marked as critical/)
-          ohai.all_plugins
+          expect { ohai.all_plugins }.to raise_error(Ohai::Exceptions::CriticalPluginFailure,
+                                                     "The following Ohai plugins marked as critical failed: [:Fails]. Failing Chef run.")
         end
-
       end
     end
   end