Merge branch 'ticket/stable/22878-close-handle' into stable

* ticket/stable/22878-close-handle:
  (#22878) Scope call to CloseHandle

Author: joshcooper

lib/puppet/util/execution.rb

@@ -147,8 +147,8 @@ def self.execute(command, options = NoOptionsSpecified)
       begin
         exit_status = Puppet::Util::Windows::Process.wait_process(process_info.process_handle)
       ensure
-        Process.CloseHandle(process_info.process_handle)
-        Process.CloseHandle(process_info.thread_handle)
+        Puppet::Util::Windows::Process.CloseHandle(process_info.process_handle)
+        Puppet::Util::Windows::Process.CloseHandle(process_info.thread_handle)
       end
     end
 

spec/unit/util/execution_spec.rb

@@ -306,8 +306,8 @@ def stub_process_wait(exitstatus)
           Puppet::Util::Execution.stubs(:execute_windows).returns(proc_info_stub)
 
           Puppet::Util::Windows::Process.expects(:wait_process).with(process_handle).raises('whatever')
-          Process.expects(:CloseHandle).with(thread_handle)
-          Process.expects(:CloseHandle).with(process_handle)
+          Puppet::Util::Windows::Process.expects(:CloseHandle).with(thread_handle)
+          Puppet::Util::Windows::Process.expects(:CloseHandle).with(process_handle)
 
           expect { Puppet::Util::Execution.execute('test command') }.to raise_error(RuntimeError)
         end