puppet 5.5.22 → 6.0.0

data/spec/unit/util/constant_inflector_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/constant_inflector'

data/spec/unit/util/diff_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/diff'
 require 'puppet/util/execution'
@@ -10,9 +11,9 @@ describe Puppet::Util::Diff do
       Puppet[:diff] = 'foo'
       Puppet[:diff_args] = 'bar'
 
-      expect(Puppet::Util::Execution).to receive(:execute)
+      Puppet::Util::Execution.expects(:execute)
         .with(['foo', 'bar', 'a', 'b'], {:failonfail => false, :combine => false})
-        .and_return(baz_output)
+        .returns(baz_output)
       expect(subject.diff('a', 'b')).to eq('baz')
     end
 
@@ -20,9 +21,9 @@ describe Puppet::Util::Diff do
       Puppet[:diff] = 'foo'
       Puppet[:diff_args] = 'bar qux'
 
-      expect(Puppet::Util::Execution).to receive(:execute)
+      Puppet::Util::Execution.expects(:execute)
         .with(['foo', 'bar', 'qux', 'a', 'b'], anything)
-        .and_return(baz_output)
+        .returns(baz_output)
       expect(subject.diff('a', 'b')).to eq('baz')
     end
 
@@ -30,16 +31,16 @@ describe Puppet::Util::Diff do
       Puppet[:diff] = 'foo'
       Puppet[:diff_args] = ''
 
-      expect(Puppet::Util::Execution).to receive(:execute)
+      Puppet::Util::Execution.expects(:execute)
         .with(['foo', 'a', 'b'], {:failonfail => false, :combine => false})
-        .and_return(baz_output)
+        .returns(baz_output)
       expect(subject.diff('a', 'b')).to eq('baz')
     end
 
     it "should return empty string if the diff command is empty" do
       Puppet[:diff] = ''
 
-      expect(Puppet::Util::Execution).not_to receive(:execute)
+      Puppet::Util::Execution.expects(:execute).never
       expect(subject.diff('a', 'b')).to eq('')
     end
   end

data/spec/unit/util/errors_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/errors'

data/spec/unit/util/execution_spec.rb

@@ -1,16 +1,15 @@
+#! /usr/bin/env ruby
 # encoding: UTF-8
 require 'spec_helper'
 require 'puppet/file_system/uniquefile'
 require 'puppet_spec/character_encoding'
 
-describe Puppet::Util::Execution do
+describe Puppet::Util::Execution, if: !Puppet::Util::Platform.jruby? do
   include Puppet::Util::Execution
-
   # utility methods to help us test some private methods without being quite so verbose
   def call_exec_posix(command, arguments, stdin, stdout, stderr)
     Puppet::Util::Execution.send(:execute_posix, command, arguments, stdin, stdout, stderr)
   end
-
   def call_exec_windows(command, arguments, stdin, stdout, stderr)
     Puppet::Util::Execution.send(:execute_windows, command, arguments, stdin, stdout, stderr)
   end
@@ -19,35 +18,36 @@ describe Puppet::Util::Execution do
     let(:pid) { 5501 }
     let(:process_handle) { 0xDEADBEEF }
     let(:thread_handle) { 0xCAFEBEEF }
-    let(:proc_info_stub) { double('processinfo', :process_handle => process_handle, :thread_handle => thread_handle, :process_id => pid) }
-    let(:null_file) { Puppet.features.microsoft_windows? ? 'NUL' : '/dev/null' }
+    let(:proc_info_stub) { stub 'processinfo', :process_handle => process_handle, :thread_handle => thread_handle, :process_id => pid}
+    let(:null_file) { Puppet::Util::Platform.windows? ? 'NUL' : '/dev/null' }
 
     def stub_process_wait(exitstatus)
-      if Puppet.features.microsoft_windows?
-        allow(Puppet::Util::Windows::Process).to receive(:wait_process).with(process_handle).and_return(exitstatus)
-        allow(FFI::WIN32).to receive(:CloseHandle).with(process_handle)
-        allow(FFI::WIN32).to receive(:CloseHandle).with(thread_handle)
+      if Puppet::Util::Platform.windows?
+        Puppet::Util::Windows::Process.stubs(:wait_process).with(process_handle).returns(exitstatus)
+        FFI::WIN32.stubs(:CloseHandle).with(process_handle)
+        FFI::WIN32.stubs(:CloseHandle).with(thread_handle)
       else
-        allow(Process).to receive(:waitpid2).with(pid, Process::WNOHANG).and_return(nil, [pid, double('child_status', :exitstatus => exitstatus)])
-        allow(Process).to receive(:waitpid2).with(pid).and_return([pid, double('child_status', :exitstatus => exitstatus)])
+        Process.stubs(:waitpid2).with(pid, Process::WNOHANG).returns(nil, [pid, stub('child_status', :exitstatus => exitstatus)])
+        Process.stubs(:waitpid2).with(pid).returns([pid, stub('child_status', :exitstatus => exitstatus)])
       end
     end
 
-    describe "#execute_posix (stubs)", :unless => Puppet.features.microsoft_windows? do
+
+    describe "#execute_posix (stubs)", :unless => Puppet::Util::Platform.windows? do
       before :each do
         # Most of the things this method does are bad to do during specs. :/
-        allow(Kernel).to receive(:fork).and_return(pid).and_yield
-        allow(Process).to receive(:setsid)
-        allow(Kernel).to receive(:exec)
-        allow(Puppet::Util::SUIDManager).to receive(:change_user)
-        allow(Puppet::Util::SUIDManager).to receive(:change_group)
+        Kernel.stubs(:fork).returns(pid).yields
+        Process.stubs(:setsid)
+        Kernel.stubs(:exec)
+        Puppet::Util::SUIDManager.stubs(:change_user)
+        Puppet::Util::SUIDManager.stubs(:change_group)
 
         # ensure that we don't really close anything!
-        allow(IO).to receive(:new)
+        (0..256).each {|n| IO.stubs(:new) }
 
-        allow($stdin).to receive(:reopen)
-        allow($stdout).to receive(:reopen)
-        allow($stderr).to receive(:reopen)
+        $stdin.stubs(:reopen)
+        $stdout.stubs(:reopen)
+        $stderr.stubs(:reopen)
 
         @stdin  = File.open(null_file, 'r')
         @stdout = Puppet::FileSystem::Uniquefile.new('stdout')
@@ -80,71 +80,53 @@ describe Puppet::Util::Execution do
 
 
       it "should fork a child process to execute the command" do
-        expect(Kernel).to receive(:fork).and_return(pid).and_yield
-        expect(Kernel).to receive(:exec).with('test command')
+        Kernel.expects(:fork).returns(pid).yields
+        Kernel.expects(:exec).with('test command')
 
         call_exec_posix('test command', {}, @stdin, @stdout, @stderr)
       end
 
       it "should start a new session group" do
-        expect(Process).to receive(:setsid)
+        Process.expects(:setsid)
 
         call_exec_posix('test command', {}, @stdin, @stdout, @stderr)
       end
 
       it "should permanently change to the correct user and group if specified" do
-        expect(Puppet::Util::SUIDManager).to receive(:change_group).with(55, true)
-        expect(Puppet::Util::SUIDManager).to receive(:change_user).with(50, true)
+        Puppet::Util::SUIDManager.expects(:change_group).with(55, true)
+        Puppet::Util::SUIDManager.expects(:change_user).with(50, true)
 
         call_exec_posix('test command', {:uid => 50, :gid => 55}, @stdin, @stdout, @stderr)
       end
 
       it "should exit failure if there is a problem execing the command" do
-        expect(Kernel).to receive(:exec).with('test command').and_raise("failed to execute!")
-        allow(Puppet::Util::Execution).to receive(:puts)
-        expect(Puppet::Util::Execution).to receive(:exit!).with(1)
+        Kernel.expects(:exec).with('test command').raises("failed to execute!")
+        Puppet::Util::Execution.stubs(:puts)
+        Puppet::Util::Execution.expects(:exit!).with(1)
 
         call_exec_posix('test command', {}, @stdin, @stdout, @stderr)
       end
 
       it "should properly execute commands specified as arrays" do
-        expect(Kernel).to receive(:exec).with('test command', 'with', 'arguments')
+        Kernel.expects(:exec).with('test command', 'with', 'arguments')
 
         call_exec_posix(['test command', 'with', 'arguments'], {:uid => 50, :gid => 55}, @stdin, @stdout, @stderr)
       end
 
       it "should properly execute string commands with embedded newlines" do
-        expect(Kernel).to receive(:exec).with("/bin/echo 'foo' ; \n /bin/echo 'bar' ;")
+        Kernel.expects(:exec).with("/bin/echo 'foo' ; \n /bin/echo 'bar' ;")
 
         call_exec_posix("/bin/echo 'foo' ; \n /bin/echo 'bar' ;", {:uid => 50, :gid => 55}, @stdin, @stdout, @stderr)
       end
 
-      context 'cwd option' do
-        let(:cwd) { 'cwd' }
-
-        it 'should run the command in the specified working directory' do
-          expect(Dir).to receive(:chdir).with(cwd)
-          expect(Kernel).to receive(:exec).with('test command')
-
-          call_exec_posix('test command', { :cwd => cwd }, @stdin, @stdout, @stderr)
-        end
-
-        it "should not change the current working directory if cwd is unspecified" do
-          expect(Dir).to receive(:chdir).never
-          expect(Kernel).to receive(:exec).with('test command')
-
-          call_exec_posix('test command', {}, @stdin, @stdout, @stderr)
-        end
-      end
-
       it "should return the pid of the child process" do
         expect(call_exec_posix('test command', {}, @stdin, @stdout, @stderr)).to eq(pid)
       end
     end
 
-    describe "#execute_windows (stubs)", :if => Puppet.features.microsoft_windows? do
+    describe "#execute_windows (stubs)", :if => Puppet::Util::Platform.windows? do
       before :each do
-        allow(Process).to receive(:create).and_return(proc_info_stub)
+        Process.stubs(:create).returns(proc_info_stub)
         stub_process_wait(0)
 
         @stdin  = File.open(null_file, 'r')
@@ -153,66 +135,23 @@ describe Puppet::Util::Execution do
       end
 
       it "should create a new process for the command" do
-        expect(Process).to receive(:create).with(
+        Process.expects(:create).with(
           :command_line => "test command",
           :startup_info => {:stdin => @stdin, :stdout => @stdout, :stderr => @stderr},
           :close_handles => false
-        ).and_return(proc_info_stub)
+        ).returns(proc_info_stub)
 
         call_exec_windows('test command', {}, @stdin, @stdout, @stderr)
       end
 
-      context 'cwd option' do
-        let(:cwd) { 'cwd' }
-        it "should execute the command in the specified working directory" do
-          expect(Dir).to receive(:chdir).with(cwd).and_yield
-          expect(Process).to receive(:create).with(
-            :command_line => "test command",
-            :startup_info => {
-              :stdin => @stdin,
-              :stdout => @stdout,
-              :stderr => @stderr
-            },
-            :close_handles => false
-          )
-
-          call_exec_windows('test command', { :cwd => cwd }, @stdin, @stdout, @stderr)
-        end
-
-        it "should not change the current working directory if cwd is unspecified" do
-          expect(Dir).to receive(:chdir).never
-          expect(Process).to receive(:create) do |args|
-            expect(args[:cwd]).to be_nil
-          end
-
-          call_exec_windows('test command', {}, @stdin, @stdout, @stderr)
-        end
-      end
-
-      context 'suppress_window option' do
-        let(:cwd) { 'cwd' }
-        it "should execute the command in the specified working directory" do
-          expect(Process).to receive(:create).with(
-            :command_line => "test command",
-            :startup_info => {
-              :stdin => @stdin,
-              :stdout => @stdout,
-              :stderr => @stderr
-            },
-            :close_handles => false,
-            :creation_flags => Puppet::Util::Windows::Process::CREATE_NO_WINDOW
-          )
-
-          call_exec_windows('test command', { :suppress_window => true }, @stdin, @stdout, @stderr)
-        end
-      end
-
       it "should return the process info of the child process" do
         expect(call_exec_windows('test command', {}, @stdin, @stdout, @stderr)).to eq(proc_info_stub)
       end
 
       it "should quote arguments containing spaces if command is specified as an array" do
-        expect(Process).to receive(:create).with(hash_including(command_line: '"test command" with some "arguments \"with spaces"')).and_return(proc_info_stub)
+        Process.expects(:create).with do |args|
+          args[:command_line] == '"test command" with some "arguments \"with spaces"'
+        end.returns(proc_info_stub)
 
         call_exec_windows(['test command', 'with', 'some', 'arguments "with spaces'], {}, @stdin, @stdout, @stderr)
       end
@@ -235,8 +174,8 @@ describe Puppet::Util::Execution do
         end
 
         it "should not actually execute anything" do
-          expect(Puppet::Util::Execution).not_to receive(:execute_posix)
-          expect(Puppet::Util::Execution).not_to receive(:execute_windows)
+          Puppet::Util::Execution.expects(:execute_posix).never
+          Puppet::Util::Execution.expects(:execute_windows).never
 
           Puppet::Util::Execution.execute("/usr/bin/run_my_execute_stub")
         end
@@ -244,223 +183,169 @@ describe Puppet::Util::Execution do
 
       describe "when setting up input and output files" do
         include PuppetSpec::Files
-
-        let(:executor) { Puppet.features.microsoft_windows? ? 'execute_windows' : 'execute_posix' }
-        let(:rval) { Puppet.features.microsoft_windows? ? proc_info_stub : pid }
+        let(:executor) { Puppet::Util::Platform.windows? ? 'execute_windows' : 'execute_posix' }
+        let(:rval) { Puppet::Util::Platform.windows? ? proc_info_stub : pid }
 
         before :each do
-          allow(Puppet::Util::Execution).to receive(:wait_for_output)
+          Puppet::Util::Execution.stubs(:wait_for_output)
         end
 
         it "should set stdin to the stdinfile if specified" do
           input = tmpfile('stdin')
           FileUtils.touch(input)
 
-          expect(Puppet::Util::Execution).to receive(executor) do |_,_,stdin,_,_|
-            expect(stdin.path).to eq(input)
-            rval
-          end
+          Puppet::Util::Execution.expects(executor).with do |_,_,stdin,_,_|
+            stdin.path == input
+          end.returns(rval)
 
           Puppet::Util::Execution.execute('test command', :stdinfile => input)
         end
 
         it "should set stdin to the null file if not specified" do
-          expect(Puppet::Util::Execution).to receive(executor) do |_,_,stdin,_,_|
-            expect(stdin.path).to eq(null_file)
-            rval
-          end
+          Puppet::Util::Execution.expects(executor).with do |_,_,stdin,_,_|
+            stdin.path == null_file
+          end.returns(rval)
 
           Puppet::Util::Execution.execute('test command')
         end
 
         describe "when squelch is set" do
           it "should set stdout and stderr to the null file" do
-            expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-              expect(stdout.path).to eq(null_file)
-              expect(stderr.path).to eq(null_file)
-              rval
-            end
+            Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+              stdout.path == null_file and stderr.path == null_file
+            end.returns(rval)
 
             Puppet::Util::Execution.execute('test command', :squelch => true)
           end
         end
 
-        describe "cwd option" do
-          def expect_cwd_to_be(cwd)
-            expect(Puppet::Util::Execution).to receive(executor).with(
-              anything,
-              hash_including(cwd: cwd),
-              anything,
-              anything,
-              anything
-            ).and_return(rval)
-          end
-
-          it 'should raise an ArgumentError if the specified working directory does not exist' do
-            cwd = 'cwd'
-            allow(Puppet::FileSystem).to receive(:directory?).with(cwd).and_return(false)
-
-            expect {
-              Puppet::Util::Execution.execute('test command', cwd: cwd)
-            }.to raise_error do |error|
-              expect(error).to be_a(ArgumentError)
-              expect(error.message).to match(cwd)
-            end
-          end
-
-          it "should set the cwd to the user-specified one" do
-            allow(Puppet::FileSystem).to receive(:directory?).with('cwd').and_return(true)
-            expect_cwd_to_be('cwd')
-            Puppet::Util::Execution.execute('test command', cwd: 'cwd')
-          end
-        end
-
         describe "on POSIX", :if => Puppet.features.posix? do
           describe "when squelch is not set" do
             it "should set stdout to a pipe" do
-              expect(Puppet::Util::Execution).to receive(executor).with(anything, anything, anything, be_a(IO), anything).and_return(rval)
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,_|
+                stdout.class == IO
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', :squelch => false)
             end
 
             it "should set stderr to the same file as stdout if combine is true" do
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout).to eq(stderr)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout == stderr
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', :squelch => false, :combine => true)
             end
 
             it "should set stderr to the null device if combine is false" do
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout.class).to eq(IO)
-                expect(stderr.path).to eq(null_file)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout.class == IO and stderr.path == null_file
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', :squelch => false, :combine => false)
             end
 
             it "should default combine to true when no options are specified" do
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout).to eq(stderr)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout == stderr
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command')
             end
 
             it "should default combine to false when options are specified, but combine is not" do
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout.class).to eq(IO)
-                expect(stderr.path).to eq(null_file)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout.class == IO and stderr.path == null_file
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', :failonfail => false)
             end
 
             it "should default combine to false when an empty hash of options is specified" do
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout.class).to eq(IO)
-                expect(stderr.path).to eq(null_file)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout.class == IO and stderr.path == null_file
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', {})
             end
           end
         end
 
-        describe "on Windows", :if => Puppet.features.microsoft_windows? do
+        describe "on Windows", :if => Puppet::Util::Platform.windows? do
           describe "when squelch is not set" do
             it "should set stdout to a temporary output file" do
               outfile = Puppet::FileSystem::Uniquefile.new('stdout')
-              allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(outfile)
+              Puppet::FileSystem::Uniquefile.stubs(:new).returns(outfile)
 
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,_|
-                expect(stdout.path).to eq(outfile.path)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,_|
+                stdout.path == outfile.path
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', :squelch => false)
             end
 
             it "should set stderr to the same file as stdout if combine is true" do
               outfile = Puppet::FileSystem::Uniquefile.new('stdout')
-              allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(outfile)
+              Puppet::FileSystem::Uniquefile.stubs(:new).returns(outfile)
 
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout.path).to eq(outfile.path)
-                expect(stderr.path).to eq(outfile.path)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout.path == outfile.path and stderr.path == outfile.path
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', :squelch => false, :combine => true)
             end
 
             it "should set stderr to the null device if combine is false" do
               outfile = Puppet::FileSystem::Uniquefile.new('stdout')
-              allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(outfile)
+              Puppet::FileSystem::Uniquefile.stubs(:new).returns(outfile)
 
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout.path).to eq(outfile.path)
-                expect(stderr.path).to eq(null_file)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout.path == outfile.path and stderr.path == null_file
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', :squelch => false, :combine => false)
             end
 
             it "should combine stdout and stderr if combine is true" do
               outfile = Puppet::FileSystem::Uniquefile.new('stdout')
-              allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(outfile)
+              Puppet::FileSystem::Uniquefile.stubs(:new).returns(outfile)
 
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout.path).to eq(outfile.path)
-                expect(stderr.path).to eq(outfile.path)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout.path == outfile.path and stderr.path == outfile.path
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', :combine => true)
             end
 
             it "should default combine to true when no options are specified" do
               outfile = Puppet::FileSystem::Uniquefile.new('stdout')
-              allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(outfile)
+              Puppet::FileSystem::Uniquefile.stubs(:new).returns(outfile)
 
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout.path).to eq(outfile.path)
-                expect(stderr.path).to eq(outfile.path)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout.path == outfile.path and stderr.path == outfile.path
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command')
             end
 
             it "should default combine to false when options are specified, but combine is not" do
               outfile = Puppet::FileSystem::Uniquefile.new('stdout')
-              allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(outfile)
+              Puppet::FileSystem::Uniquefile.stubs(:new).returns(outfile)
 
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout.path).to eq(outfile.path)
-                expect(stderr.path).to eq(null_file)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout.path == outfile.path and stderr.path == null_file
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', :failonfail => false)
             end
 
             it "should default combine to false when an empty hash of options is specified" do
               outfile = Puppet::FileSystem::Uniquefile.new('stdout')
-              allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(outfile)
+              Puppet::FileSystem::Uniquefile.stubs(:new).returns(outfile)
 
-              expect(Puppet::Util::Execution).to receive(executor) do |_,_,_,stdout,stderr|
-                expect(stdout.path).to eq(outfile.path)
-                expect(stderr.path).to eq(null_file)
-                rval
-              end
+              Puppet::Util::Execution.expects(executor).with do |_,_,_,stdout,stderr|
+                stdout.path == outfile.path and stderr.path == null_file
+              end.returns(rval)
 
               Puppet::Util::Execution.execute('test command', {})
             end
@@ -468,13 +353,13 @@ describe Puppet::Util::Execution do
         end
       end
 
-      describe "on Windows", :if => Puppet.features.microsoft_windows? do
+      describe "on Windows", :if => Puppet::Util::Platform.windows? do
         it "should always close the process and thread handles" do
-          allow(Puppet::Util::Execution).to receive(:execute_windows).and_return(proc_info_stub)
+          Puppet::Util::Execution.stubs(:execute_windows).returns(proc_info_stub)
 
-          expect(Puppet::Util::Windows::Process).to receive(:wait_process).with(process_handle).and_raise('whatever')
-          expect(FFI::WIN32).to receive(:CloseHandle).with(thread_handle)
-          expect(FFI::WIN32).to receive(:CloseHandle).with(process_handle)
+          Puppet::Util::Windows::Process.expects(:wait_process).with(process_handle).raises('whatever')
+          FFI::WIN32.expects(:CloseHandle).with(thread_handle)
+          FFI::WIN32.expects(:CloseHandle).with(process_handle)
 
           expect { Puppet::Util::Execution.execute('test command') }.to raise_error(RuntimeError)
         end
@@ -482,16 +367,17 @@ describe Puppet::Util::Execution do
         it "should return the correct exit status even when exit status is greater than 256" do
           real_exit_status = 3010
 
-          allow(Puppet::Util::Execution).to receive(:execute_windows).and_return(proc_info_stub)
+          Puppet::Util::Execution.stubs(:execute_windows).returns(proc_info_stub)
           stub_process_wait(real_exit_status)
-          allow(Puppet::Util::Execution).to receive(:exitstatus).and_return(real_exit_status % 256) # The exitstatus is changed to be mod 256 so that ruby can fit it into 8 bits.
+          Puppet::Util::Execution.stubs(:exitstatus).returns(real_exit_status % 256) # The exitstatus is changed to be mod 256 so that ruby can fit it into 8 bits.
 
           expect(Puppet::Util::Execution.execute('test command', :failonfail => false).exitstatus).to eq(real_exit_status)
         end
       end
     end
 
-    describe "#execute (posix locale)", :unless => Puppet.features.microsoft_windows?  do
+    describe "#execute (posix locale)", :unless => Puppet::Util::Platform.windows? do
+
       before :each do
         # there is a danger here that ENV will be modified by exec_posix.  Normally it would only affect the ENV
         #  of a forked process, but, in some of the previous tests in this file we're stubbing Kernel.fork., which could
@@ -510,6 +396,7 @@ describe Puppet::Util::Execution do
         expect(cur_env.keys - @saved_env.keys).to eq([])
       end
 
+
       # build up a printf-style string that contains a command to get the value of an environment variable
       # from the operating system.  We can substitute into this with the names of the desired environment variables later.
       get_env_var_cmd = 'echo $%s'
@@ -582,7 +469,7 @@ describe Puppet::Util::Execution do
       end
     end
 
-    describe "#execute (posix user env vars)", :unless => Puppet.features.microsoft_windows?  do
+    describe "#execute (posix user env vars)", :unless => Puppet::Util::Platform.windows? do
       # build up a printf-style string that contains a command to get the value of an environment variable
       # from the operating system.  We can substitute into this with the names of the desired environment variables later.
       get_env_var_cmd = 'echo $%s'
@@ -610,6 +497,7 @@ describe Puppet::Util::Execution do
             # ensure that after the exec, our temporary env is still intact
             expect(ENV[var]).to eq(user_sentinel_env[var])
           end
+
         end
       end
 
@@ -635,6 +523,7 @@ describe Puppet::Util::Execution do
             expect(ENV[var]).to eq(user_sentinel_env[var])
           end
         end
+
       end
     end
 
@@ -642,55 +531,47 @@ describe Puppet::Util::Execution do
       before :each do
         stub_process_wait(0)
 
-        if Puppet.features.microsoft_windows?
-          allow(Puppet::Util::Execution).to receive(:execute_windows).and_return(proc_info_stub)
+        if Puppet::Util::Platform.windows?
+          Puppet::Util::Execution.stubs(:execute_windows).returns(proc_info_stub)
         else
-          allow(Puppet::Util::Execution).to receive(:execute_posix).and_return(pid)
+          Puppet::Util::Execution.stubs(:execute_posix).returns(pid)
         end
       end
 
       it "should log if no uid or gid specified" do
-        expect(Puppet::Util::Execution).to receive(:debug).with("Executing: 'echo hello'")
+        Puppet::Util::Execution.expects(:debug).with("Executing: 'echo hello'")
         Puppet::Util::Execution.execute('echo hello')
       end
-
       it "should log numeric uid if specified" do
-        expect(Puppet::Util::Execution).to receive(:debug).with("Executing with uid=100: 'echo hello'")
+        Puppet::Util::Execution.expects(:debug).with("Executing with uid=100: 'echo hello'")
         Puppet::Util::Execution.execute('echo hello', {:uid => 100})
       end
-
       it "should log numeric gid if specified" do
-        expect(Puppet::Util::Execution).to receive(:debug).with("Executing with gid=500: 'echo hello'")
+        Puppet::Util::Execution.expects(:debug).with("Executing with gid=500: 'echo hello'")
         Puppet::Util::Execution.execute('echo hello', {:gid => 500})
       end
-
       it "should log numeric uid and gid if specified" do
-        expect(Puppet::Util::Execution).to receive(:debug).with("Executing with uid=100 gid=500: 'echo hello'")
+        Puppet::Util::Execution.expects(:debug).with("Executing with uid=100 gid=500: 'echo hello'")
         Puppet::Util::Execution.execute('echo hello', {:uid => 100, :gid => 500})
       end
-
       it "should log string uid if specified" do
-        expect(Puppet::Util::Execution).to receive(:debug).with("Executing with uid=myuser: 'echo hello'")
+        Puppet::Util::Execution.expects(:debug).with("Executing with uid=myuser: 'echo hello'")
         Puppet::Util::Execution.execute('echo hello', {:uid => 'myuser'})
       end
-
       it "should log string gid if specified" do
-        expect(Puppet::Util::Execution).to receive(:debug).with("Executing with gid=mygroup: 'echo hello'")
+        Puppet::Util::Execution.expects(:debug).with("Executing with gid=mygroup: 'echo hello'")
         Puppet::Util::Execution.execute('echo hello', {:gid => 'mygroup'})
       end
-
       it "should log string uid and gid if specified" do
-        expect(Puppet::Util::Execution).to receive(:debug).with("Executing with uid=myuser gid=mygroup: 'echo hello'")
+        Puppet::Util::Execution.expects(:debug).with("Executing with uid=myuser gid=mygroup: 'echo hello'")
         Puppet::Util::Execution.execute('echo hello', {:uid => 'myuser', :gid => 'mygroup'})
       end
-
       it "should log numeric uid and string gid if specified" do
-        expect(Puppet::Util::Execution).to receive(:debug).with("Executing with uid=100 gid=mygroup: 'echo hello'")
+        Puppet::Util::Execution.expects(:debug).with("Executing with uid=100 gid=mygroup: 'echo hello'")
         Puppet::Util::Execution.execute('echo hello', {:uid => 100, :gid => 'mygroup'})
       end
-
       it 'should redact commands in debug output when passed sensitive option' do
-        expect(Puppet::Util::Execution).to receive(:debug).with("Executing: '[redacted]'")
+        Puppet::Util::Execution.expects(:debug).with("Executing: '[redacted]'")
         Puppet::Util::Execution.execute('echo hello', {:sensitive => true})
       end
     end
@@ -699,28 +580,30 @@ describe Puppet::Util::Execution do
       before :each do
         stub_process_wait(0)
 
-        if Puppet.features.microsoft_windows?
-          allow(Puppet::Util::Execution).to receive(:execute_windows).and_return(proc_info_stub)
+        if Puppet::Util::Platform.windows?
+          Puppet::Util::Execution.stubs(:execute_windows).returns(proc_info_stub)
         else
-          allow(Puppet::Util::Execution).to receive(:execute_posix).and_return(pid)
+          Puppet::Util::Execution.stubs(:execute_posix).returns(pid)
         end
       end
 
       it "should wait for the child process to exit" do
-        allow(Puppet::Util::Execution).to receive(:wait_for_output)
+        Puppet::Util::Execution.stubs(:wait_for_output)
 
         Puppet::Util::Execution.execute('test command')
       end
 
       it "should close the stdin/stdout/stderr files used by the child" do
-        stdin = double('file')
-        stdout = double('file')
-        stderr = double('file')
-        [stdin, stdout, stderr].each {|io| expect(io).to receive(:close).at_least(:once)}
+        stdin = mock 'file'
+        stdout = mock 'file'
+        stderr = mock 'file'
+        [stdin, stdout, stderr].each {|io| io.expects(:close).at_least_once}
 
-        expect(File).to receive(:open).
-            exactly(3).times().
-            and_return(stdin, stdout, stderr)
+        File.expects(:open).
+            times(3).
+            returns(stdin).
+            then.returns(stdout).
+            then.returns(stderr)
 
         Puppet::Util::Execution.execute('test command', {:squelch => true, :combine => false})
       end
@@ -729,7 +612,7 @@ describe Puppet::Util::Execution do
         context "reading the output" do
           before :each do
             r, w = IO.pipe
-            expect(IO).to receive(:pipe).and_return([r, w])
+            IO.expects(:pipe).returns([r, w])
             w.write("My expected \u2744 command output")
           end
 
@@ -751,14 +634,14 @@ describe Puppet::Util::Execution do
         end
 
         it "should not read the output if squelch is true" do
-          expect(IO).not_to receive(:pipe)
+          IO.expects(:pipe).never
 
           expect(Puppet::Util::Execution.execute('test command', :squelch => true)).to eq('')
         end
 
         it "should close the pipe used for output if squelch is false" do
           r, w = IO.pipe
-          expect(IO).to receive(:pipe).and_return([r, w])
+          IO.expects(:pipe).returns([r, w])
 
           expect(Puppet::Util::Execution.execute('test command')).to eq("")
           expect(r.closed?)
@@ -767,12 +650,12 @@ describe Puppet::Util::Execution do
 
         it "should close the pipe used for output if squelch is false and an error is raised" do
           r, w = IO.pipe
-          expect(IO).to receive(:pipe).and_return([r, w])
+          IO.expects(:pipe).returns([r, w])
 
-          if Puppet.features.microsoft_windows?
-            expect(Puppet::Util::Execution).to receive(:execute_windows).and_raise(Exception, 'execution failed')
+          if Puppet::Util::Platform.windows?
+            Puppet::Util::Execution.expects(:execute_windows).raises(Exception, 'execution failed')
           else
-            expect(Puppet::Util::Execution).to receive(:execute_posix).and_raise(Exception, 'execution failed')
+            Puppet::Util::Execution.expects(:execute_posix).raises(Exception, 'execution failed')
           end
 
           expect {
@@ -782,12 +665,11 @@ describe Puppet::Util::Execution do
           expect(w.closed?)
         end
       end
-
-      describe "on Windows", :if => Puppet.features.microsoft_windows? do
+      describe "on Windows", :if => Puppet::Util::Platform.windows? do
         context "reading the output" do
           before :each do
             stdout = Puppet::FileSystem::Uniquefile.new('test')
-            allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(stdout)
+            Puppet::FileSystem::Uniquefile.stubs(:new).returns(stdout)
             stdout.write("My expected \u2744 command output")
           end
 
@@ -810,7 +692,7 @@ describe Puppet::Util::Execution do
 
         it "should not read the output if squelch is true" do
           stdout = Puppet::FileSystem::Uniquefile.new('test')
-          allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(stdout)
+          Puppet::FileSystem::Uniquefile.stubs(:new).returns(stdout)
           stdout.write("My expected command output")
 
           expect(Puppet::Util::Execution.execute('test command', :squelch => true)).to eq('')
@@ -819,7 +701,7 @@ describe Puppet::Util::Execution do
         it "should delete the file used for output if squelch is false" do
           stdout = Puppet::FileSystem::Uniquefile.new('test')
           path = stdout.path
-          allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(stdout)
+          Puppet::FileSystem::Uniquefile.stubs(:new).returns(stdout)
 
           Puppet::Util::Execution.execute('test command')
 
@@ -828,7 +710,7 @@ describe Puppet::Util::Execution do
 
         it "should not raise an error if the file is open" do
           stdout = Puppet::FileSystem::Uniquefile.new('test')
-          allow(Puppet::FileSystem::Uniquefile).to receive(:new).and_return(stdout)
+          Puppet::FileSystem::Uniquefile.stubs(:new).returns(stdout)
 
           Puppet::Util::Execution.execute('test command')
         end
@@ -898,68 +780,68 @@ describe Puppet::Util::Execution do
 
   describe "#execpipe" do
     it "should execute a string as a string" do
-      expect(Puppet::Util::Execution).to receive(:open).with('| echo hello 2>&1').and_return('hello')
-      expect(Puppet::Util::Execution).to receive(:exitstatus).and_return(0)
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
+      Puppet::Util::Execution.expects(:exitstatus).returns(0)
       expect(Puppet::Util::Execution.execpipe('echo hello')).to eq('hello')
     end
 
     it "should print meaningful debug message for string argument" do
-      expect(Puppet::Util::Execution).to receive(:debug).with("Executing 'echo hello'")
-      expect(Puppet::Util::Execution).to receive(:open).with('| echo hello 2>&1').and_return('hello')
-      expect(Puppet::Util::Execution).to receive(:exitstatus).and_return(0)
+      Puppet::Util::Execution.expects(:debug).with("Executing 'echo hello'")
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
+      Puppet::Util::Execution.expects(:exitstatus).returns(0)
       Puppet::Util::Execution.execpipe('echo hello')
     end
 
     it "should print meaningful debug message for array argument" do
-      expect(Puppet::Util::Execution).to receive(:debug).with("Executing 'echo hello'")
-      expect(Puppet::Util::Execution).to receive(:open).with('| echo hello 2>&1').and_return('hello')
-      expect(Puppet::Util::Execution).to receive(:exitstatus).and_return(0)
+      Puppet::Util::Execution.expects(:debug).with("Executing 'echo hello'")
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
+      Puppet::Util::Execution.expects(:exitstatus).returns(0)
       Puppet::Util::Execution.execpipe(['echo','hello'])
     end
 
     it "should execute an array by pasting together with spaces" do
-      expect(Puppet::Util::Execution).to receive(:open).with('| echo hello 2>&1').and_return('hello')
-      expect(Puppet::Util::Execution).to receive(:exitstatus).and_return(0)
+      Puppet::Util::Execution.expects(:open).with('| echo hello 2>&1').returns('hello')
+      Puppet::Util::Execution.expects(:exitstatus).returns(0)
       expect(Puppet::Util::Execution.execpipe(['echo', 'hello'])).to eq('hello')
     end
 
     it "should fail if asked to fail, and the child does" do
-      allow(Puppet::Util::Execution).to receive(:open).with('| echo hello 2>&1').and_return('error message')
-      expect(Puppet::Util::Execution).to receive(:exitstatus).and_return(1)
+      Puppet::Util::Execution.stubs(:open).with('| echo hello 2>&1').returns('error message')
+      Puppet::Util::Execution.expects(:exitstatus).returns(1)
       expect {
         Puppet::Util::Execution.execpipe('echo hello')
       }.to raise_error Puppet::ExecutionFailure, /error message/
     end
 
     it "should not fail if asked not to fail, and the child does" do
-      allow(Puppet::Util::Execution).to receive(:open).and_return('error message')
+      Puppet::Util::Execution.stubs(:open).returns('error message')
       expect(Puppet::Util::Execution.execpipe('echo hello', false)).to eq('error message')
     end
   end
 
   describe "execfail" do
     it "returns the executed command output" do
-      allow(Puppet::Util::Execution).to receive(:execute)
-        .and_return(Puppet::Util::Execution::ProcessOutput.new("process output", 0))
+      Puppet::Util::Execution.stubs(:execute)
+        .returns(Puppet::Util::Execution::ProcessOutput.new("process output", 0))
       expect(Puppet::Util::Execution.execfail('echo hello', Puppet::Error)).to eq('process output')
     end
 
     it "raises a caller-specified exception on failure with the backtrace" do
-      allow(Puppet::Util::Execution).to receive(:execute).and_raise(Puppet::ExecutionFailure, "failed to execute")
+      Puppet::Util::Execution.stubs(:execute).raises(Puppet::ExecutionFailure, "failed to execute")
       expect {
         Puppet::Util::Execution.execfail("this will fail", Puppet::Error)
       }.to raise_error(Puppet::Error, /failed to execute/)
     end
 
     it "raises exceptions that don't extend ExecutionFailure" do
-      allow(Puppet::Util::Execution).to receive(:execute).and_raise(ArgumentError, "failed to execute")
+      Puppet::Util::Execution.stubs(:execute).raises(ArgumentError, "failed to execute")
       expect {
         Puppet::Util::Execution.execfail("this will fail", Puppet::Error)
       }.to raise_error(ArgumentError, /failed to execute/)
     end
 
     it "raises a TypeError if the exception class is nil" do
-      allow(Puppet::Util::Execution).to receive(:execute).and_raise(Puppet::ExecutionFailure, "failed to execute")
+      Puppet::Util::Execution.stubs(:execute).raises(Puppet::ExecutionFailure, "failed to execute")
       expect {
         Puppet::Util::Execution.execfail('echo hello', nil)
       }.to raise_error(TypeError, /exception class\/object expected/)