Merge pull request #9492 from MsysTechnologiesllc/sangmesh/Fixed_Use_Ohai_data_to_determine_if_we_have_PowerShell_installed

powershell_package: Use ohai data to get the powershell release instead of shelling out

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/chef/provider/package/powershell.rb b/lib/chef/provider/package/powershell.rb
index a27f7fa6c8..01fe603363 100644
--- a/lib/chef/provider/package/powershell.rb
+++ b/lib/chef/provider/package/powershell.rb
@@ -36,7 +36,7 @@ class Chef
 
         def define_resource_requirements
           super
-          if powershell_out("$PSVersionTable.PSVersion.Major").stdout.strip.to_i < 5
+          if powershell_version < 5
             raise "Minimum installed PowerShell Version required is 5"
           end
 
diff --git a/spec/unit/provider/package/powershell_spec.rb b/spec/unit/provider/package/powershell_spec.rb
index e4adc402cb..455ec21092 100644
--- a/spec/unit/provider/package/powershell_spec.rb
+++ b/spec/unit/provider/package/powershell_spec.rb
@@ -19,7 +19,7 @@
 require "spec_helper"
 require "chef/mixin/powershell_out"
 
-describe Chef::Provider::Package::Powershell do
+describe Chef::Provider::Package::Powershell, :windows_only do
   include Chef::Mixin::PowershellOut
   let(:timeout) { 900 }
   let(:source) { nil }
@@ -28,6 +28,7 @@ describe Chef::Provider::Package::Powershell do
 
   let(:provider) do
     node = Chef::Node.new
+    node.consume_external_attrs(OHAI_SYSTEM.data.dup, {})
     events = Chef::EventDispatch::Dispatcher.new
     run_context = Chef::RunContext.new(node, {}, events)
     Chef::Provider::Package::Powershell.new(new_resource, run_context)