summaryrefslogtreecommitdiff
path: root/spec/functional/util
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2016-02-01 15:24:27 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2016-02-02 08:14:51 -0800
commit4906f0b6bea47b4e2c564d66c6232b1efa70114a (patch)
tree9aef1c31d00e7eecd052093a2547ce6856471ebf /spec/functional/util
parent647680009efb898e4b5614114b6ed7f188f4033a (diff)
downloadchef-4906f0b6bea47b4e2c564d66c6232b1efa70114a.tar.gz
Use OHAI_SYSTEM where possible
Rerunning ohai wastes a lot of time. This should get us back to within our time limits in appveyor even with the perf regression in Ohai. Don't rerun ohai for unit/regsitry_helper_spec Ohai is slow. We don't need to rerun this, it's already run in our spec_helper. Don't keep rerunning ohai for reboot_pending_spec Running Ohai is slow. This should know almost 2 mins off the runtime of the tests. Don't need to run ohai for registry_spec crypto_spec does not need its own ohai cmdlet_spec does not need its own ohai functional registry_helper_spec does not need its own ohai Use spec ohai system for knife configure_spec Use OHAI_SYSTEM for dsc_script_spec use OHAI_SYSTEM for dsc_resource_spec
Diffstat (limited to 'spec/functional/util')
-rw-r--r--spec/functional/util/powershell/cmdlet_spec.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/spec/functional/util/powershell/cmdlet_spec.rb b/spec/functional/util/powershell/cmdlet_spec.rb
index fe9438f467..7b023d9fb8 100644
--- a/spec/functional/util/powershell/cmdlet_spec.rb
+++ b/spec/functional/util/powershell/cmdlet_spec.rb
@@ -21,11 +21,8 @@ require File.expand_path("../../../../spec_helper", __FILE__)
describe Chef::Util::Powershell::Cmdlet, :windows_powershell_dsc_only do
before(:all) do
- ohai = Ohai::System.new
- ohai.load_plugins
- ohai.run_plugins(true, ["platform", "kernel"])
@node = Chef::Node.new
- @node.consume_external_attrs(ohai.data, {})
+ @node.consume_external_attrs(OHAI_SYSTEM.data, {})
end
let(:cmd_output_format) { :text }
let(:simple_cmdlet) { Chef::Util::Powershell::Cmdlet.new(@node, "get-childitem", cmd_output_format, {:depth => 2}) }