puppet 6.0.10-x86-mingw32 → 6.1.0-x86-mingw32

data/spec/unit/util/windows/api_types_spec.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+#!/usr/bin/env ruby
 
 require 'spec_helper'
 

data/spec/unit/util/windows/eventlog_spec.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'spec_helper'
 
 require 'puppet/util/windows'
@@ -21,7 +23,7 @@ describe Puppet::Util::Windows::EventLog, :if => Puppet::Util::Platform.windows?
     it "sets a handle to the event log" do
       default_name = Puppet::Util::Windows::String.wide_string('Puppet')
       # return nil explicitly just to reinforce that we're not leaking eventlog handle
-      expect_any_instance_of(Puppet::Util::Windows::EventLog).to receive(:RegisterEventSourceW).with(anything, default_name).and_return(nil)
+      Puppet::Util::Windows::EventLog.any_instance.expects(:RegisterEventSourceW).with(nil, default_name).returns(nil)
       Puppet::Util::Windows::EventLog.new
     end
 
@@ -29,7 +31,7 @@ describe Puppet::Util::Windows::EventLog, :if => Puppet::Util::Platform.windows?
       before do
         # RegisterEventSourceW will return NULL on failure
         # Stubbing prevents leaking eventlog handle
-        allow_any_instance_of(Puppet::Util::Windows::EventLog).to receive(:RegisterEventSourceW).and_return(Puppet::Util::Windows::EventLog::NULL_HANDLE)
+        Puppet::Util::Windows::EventLog.any_instance.stubs(:RegisterEventSourceW).returns(Puppet::Util::Windows::EventLog::NULL_HANDLE)
       end
 
       it "raises an exception warning that the event log failed to open" do
@@ -38,11 +40,11 @@ describe Puppet::Util::Windows::EventLog, :if => Puppet::Util::Platform.windows?
 
       it "passes the exit code to the exception constructor" do
         fake_error = Puppet::Util::Windows::EventLog::EventLogError.new('foo', 87)
-        allow(FFI).to receive(:errno).and_return(87)
+        FFI.stubs(:errno).returns(87)
         # All we're testing here is that the constructor actually receives the exit code from FFI.errno (87)
         # We do so because `expect to...raise_error` doesn't support multiple parameter match arguments
         # We return fake_error just because `raise` expects an exception class
-        expect(Puppet::Util::Windows::EventLog::EventLogError).to receive(:new).with(/failed to open Windows eventlog/, 87).and_return(fake_error)
+        Puppet::Util::Windows::EventLog::EventLogError.expects(:new).with(regexp_matches(/failed to open Windows eventlog/), 87).returns(fake_error)
         expect { Puppet::Util::Windows::EventLog.open('foo') }.to raise_error(Puppet::Util::Windows::EventLog::EventLogError)
       end
     end
@@ -51,9 +53,9 @@ describe Puppet::Util::Windows::EventLog, :if => Puppet::Util::Platform.windows?
   describe "#close" do
     it "closes the handle to the event log" do
       @handle = "12345"
-      allow_any_instance_of(Puppet::Util::Windows::EventLog).to receive(:RegisterEventSourceW).and_return(@handle)
+      Puppet::Util::Windows::EventLog.any_instance.stubs(:RegisterEventSourceW).returns(@handle)
       event_log = Puppet::Util::Windows::EventLog.new
-      expect(event_log).to receive(:DeregisterEventSource).with(@handle).and_return(1)
+      event_log.expects(:DeregisterEventSource).with(@handle).returns(1)
       event_log.close
     end
   end
@@ -66,7 +68,7 @@ describe Puppet::Util::Windows::EventLog, :if => Puppet::Util::Platform.windows?
     context "when an event report fails" do
       before do
         # ReportEventW returns 0 on failure, which is mapped to WIN32_FALSE
-        allow(@event_log).to receive(:ReportEventW).and_return(Puppet::Util::Windows::EventLog::WIN32_FALSE)
+        @event_log.stubs(:ReportEventW).returns(Puppet::Util::Windows::EventLog::WIN32_FALSE)
       end
 
       it "raises an exception warning that the event report failed" do
@@ -75,17 +77,18 @@ describe Puppet::Util::Windows::EventLog, :if => Puppet::Util::Platform.windows?
 
       it "passes the exit code to the exception constructor" do
         fake_error = Puppet::Util::Windows::EventLog::EventLogError.new('foo', 5)
-        allow(FFI).to receive(:errno).and_return(5)
+        FFI.stubs(:errno).returns(5)
         # All we're testing here is that the constructor actually receives the exit code from FFI.errno (5)
         # We do so because `expect to...raise_error` doesn't support multiple parameter match arguments
         # We return fake_error just because `raise` expects an exception class
-        expect(Puppet::Util::Windows::EventLog::EventLogError).to receive(:new).with(/failed to report event/, 5).and_return(fake_error)
+        Puppet::Util::Windows::EventLog::EventLogError.expects(:new).with(regexp_matches(/failed to report event/), 5).returns(fake_error)
         expect { @event_log.report_event(:data => 'foo', :event_type => Puppet::Util::Windows::EventLog::EVENTLOG_ERROR_TYPE, :event_id => 0x03) }.to raise_error(Puppet::Util::Windows::EventLog::EventLogError)
       end
     end
   end
 
   describe "self.to_native" do
+
     it "raises an exception if the log level is not supported" do
       expect { Puppet::Util::Windows::EventLog.to_native(:foo) }.to raise_error(ArgumentError)
     end

data/spec/unit/util/windows/file_spec.rb

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

data/spec/unit/util/windows/root_certs_spec.rb

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

data/spec/unit/util/windows/security_descriptor_spec.rb

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

data/spec/unit/util/windows/service_spec.rb

@@ -1,12 +1,13 @@
+#!/usr/bin/env ruby
 require 'spec_helper'
 
 describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_windows? do
   require 'puppet/util/windows'
 
   before(:each) do
-    allow(Puppet::Util::Windows::Error).to receive(:format_error_code)
+    Puppet::Util::Windows::Error.stubs(:format_error_code)
       .with(anything)
-      .and_return("fake error!")
+      .returns("fake error!")
   end
 
   def service_state_str(state)
@@ -21,7 +22,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
   # just an expectation of subject::SERVICE_STATUS_PROCESS.new in sequence that
   # returns the value passed in as a param
   def expect_successful_status_query_and_return(query_return)
-    expect(subject::SERVICE_STATUS_PROCESS).to receive(:new).and_return(query_return)
+    subject::SERVICE_STATUS_PROCESS.expects(:new).in_sequence(status_checks).returns(query_return)
   end
 
   def expect_successful_status_queries_and_return(*query_returns)
@@ -38,33 +39,35 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
   # just an expectation of subject::QUERY_SERVICE_CONFIGW.new in sequence that
   # returns the value passed in as a param
   def expect_successful_config_query_and_return(query_return)
-    expect(subject::QUERY_SERVICE_CONFIGW).to receive(:new).and_return(query_return)
+    subject::QUERY_SERVICE_CONFIGW.expects(:new).in_sequence(status_checks).returns(query_return)
   end
 
   let(:subject)      { Puppet::Util::Windows::Service }
-  let(:pointer) { double() }
-  let(:mock_service_name) { double() }
-  let(:service) { double() }
-  let(:scm) { double() }
+  let(:pointer) { mock() }
+  let(:status_checks) { sequence('status_checks') }
+  let(:mock_service_name) { mock() }
+  let(:service) { mock() }
+  let(:scm) { mock() }
+  let(:timeout) { 30 }
 
   before do
-    allow(subject).to receive(:QueryServiceStatusEx).and_return(1)
-    allow(subject).to receive(:QueryServiceConfigW).and_return(1)
-    allow(subject).to receive(:ChangeServiceConfigW).and_return(1)
-    allow(subject).to receive(:OpenSCManagerW).and_return(scm)
-    allow(subject).to receive(:OpenServiceW).and_return(service)
-    allow(subject).to receive(:CloseServiceHandle)
-    allow(subject).to receive(:EnumServicesStatusExW).and_return(1)
-    allow(subject).to receive(:wide_string)
-    allow(subject::SERVICE_STATUS_PROCESS).to receive(:new)
-    allow(subject::QUERY_SERVICE_CONFIGW).to receive(:new)
-    allow(subject::SERVICE_STATUS).to receive(:new).and_return({:dwCurrentState => subject::SERVICE_RUNNING})
-    allow(FFI).to receive(:errno).and_return(0)
-    allow(FFI::MemoryPointer).to receive(:new).and_yield(pointer)
-    allow(pointer).to receive(:read_dword)
-    allow(pointer).to receive(:write_dword)
-    allow(pointer).to receive(:size)
-    allow(subject).to receive(:sleep)
+    subject.stubs(:QueryServiceStatusEx).returns(1)
+    subject.stubs(:QueryServiceConfigW).returns(1)
+    subject.stubs(:ChangeServiceConfigW).returns(1)
+    subject.stubs(:OpenSCManagerW).returns(scm)
+    subject.stubs(:OpenServiceW).returns(service)
+    subject.stubs(:CloseServiceHandle)
+    subject.stubs(:EnumServicesStatusExW).returns(1)
+    subject.stubs(:wide_string)
+    subject::SERVICE_STATUS_PROCESS.stubs(:new)
+    subject::QUERY_SERVICE_CONFIGW.stubs(:new)
+    subject::SERVICE_STATUS.stubs(:new).returns({:dwCurrentState => subject::SERVICE_RUNNING})
+    FFI.stubs(:errno).returns(0)
+    FFI::MemoryPointer.stubs(:new).yields(pointer)
+    pointer.stubs(:read_dword)
+    pointer.stubs(:write_dword)
+    pointer.stubs(:size)
+    subject.stubs(:sleep)
   end
 
   describe "#exists?" do
@@ -79,7 +82,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
       let(:service) { FFI::Pointer::NULL_HANDLE }
 
       it "returns false if it fails to open because the service does not exist" do
-        allow(FFI).to receive(:errno).and_return(Puppet::Util::Windows::Service::ERROR_SERVICE_DOES_NOT_EXIST)
+        FFI.stubs(:errno).returns(Puppet::Util::Windows::Service::ERROR_SERVICE_DOES_NOT_EXIST)
 
         expect(subject.exists?(mock_service_name)).to be false
       end
@@ -111,9 +114,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
     final_state_str = Puppet::Util::Windows::Service::SERVICE_STATES[final_state].to_s
 
     it "raises a Puppet::Error if the service query fails" do
-      expect(subject).to receive(:QueryServiceStatusEx).and_return(FFI::WIN32_FALSE)
+      subject.expects(:QueryServiceStatusEx).in_sequence(status_checks).returns(FFI::WIN32_FALSE)
 
-      expect { subject.send(action, mock_service_name) }.to raise_error(Puppet::Error)
+      expect { subject.send(action, mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
     end
 
     it "raises a Puppet::Error if the service unexpectedly transitions to a state other than #{pending_state_str} or #{final_state_str}" do
@@ -121,7 +124,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
 
       expect_successful_status_query_and_return(dwCurrentState: invalid_state)
 
-      expect { subject.send(action, mock_service_name) }.to raise_error(Puppet::Error)
+      expect { subject.send(action, mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
     end
 
     it "waits for at least 1 second if the wait_hint/10 is < 1 second" do
@@ -130,9 +133,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
         { :dwCurrentState => final_state }
       )
 
-      expect(subject).to receive(:sleep).with(1)
+      subject.expects(:sleep).with(1)
 
-      subject.send(action, mock_service_name)
+      subject.send(action, mock_service_name, timeout: timeout)
     end
 
     it "waits for at most 10 seconds if wait_hint/10 is > 10 seconds" do
@@ -141,9 +144,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
         { :dwCurrentState => final_state }
       )
 
-      expect(subject).to receive(:sleep).with(10)
+      subject.expects(:sleep).with(10)
 
-      subject.send(action, mock_service_name)
+      subject.send(action, mock_service_name, timeout: timeout)
     end
 
     it "does not raise an error if the service makes any progress while transitioning to #{final_state_str}" do
@@ -158,7 +161,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
         { :dwCurrentState => final_state }
       )
 
-      expect { subject.send(action, mock_service_name) }.to_not raise_error
+      expect { subject.send(action, mock_service_name, timeout: timeout) }.to_not raise_error
     end
 
     it "raises a Puppet::Error if it times out while waiting for the transition to #{final_state_str}" do
@@ -170,7 +173,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
         )
       end
 
-      expect { subject.send(action, mock_service_name) }.to raise_error(Puppet::Error)
+      expect { subject.send(action, mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
     end
   end
 
@@ -199,7 +202,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
     it "noops if the service is already in the #{final_state} state" do
       expect_successful_status_query_and_return(dwCurrentState: final_state)
 
-      expect { subject.send(action, mock_service_name) }.to_not raise_error
+      expect { subject.send(action, mock_service_name, timeout: timeout) }.to_not raise_error
     end
 
     # invalid_initial_states will be empty for the #stop action
@@ -208,8 +211,8 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
       it "raises a Puppet::Error if the service's initial state is not one of #{valid_initial_states_str}" do
         invalid_initial_state = invalid_initial_states.first
         expect_successful_status_query_and_return(dwCurrentState: invalid_initial_state)
-  
-        expect{ subject.send(action, mock_service_name) }.to raise_error(Puppet::Error)
+
+        expect{ subject.send(action, mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
     end
 
@@ -236,7 +239,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
           # This mocks the status query to return the 'final_state' by default. Otherwise,
           # we will fail the tests in the latter parts of the code where we wait for the
           # service to finish transitioning to the 'final_state'.
-          allow(subject::SERVICE_STATUS_PROCESS).to receive(:new).and_return(dwCurrentState: final_state)
+          subject::SERVICE_STATUS_PROCESS.stubs(:new).returns(dwCurrentState: final_state)
 
           # Set our service's initial state
           expect_successful_status_query_and_return(dwCurrentState: unsafe_pending_state)
@@ -262,9 +265,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
       end
 
       it "raises a Puppet::Error if the service query fails" do
-        expect(subject).to receive(:QueryServiceStatusEx).and_return(FFI::WIN32_FALSE)
+        subject.expects(:QueryServiceStatusEx).in_sequence(status_checks).returns(FFI::WIN32_FALSE)
 
-        expect { subject.send(action, mock_service_name) }.to raise_error(Puppet::Error)
+        expect { subject.send(action, mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
 
       it "waits, then queries again until it transitions to #{final_state_str}" do
@@ -274,9 +277,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
           { :dwCurrentState => final_state }
         )
 
-        expect(subject).to receive(:sleep).with(1).twice
+        subject.expects(:sleep).with(1).twice
 
-        subject.send(action, mock_service_name)
+        subject.send(action, mock_service_name, timeout: timeout)
       end
 
       context "when it transitions to the #{pending_state_str} state" do
@@ -294,7 +297,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
           expect_successful_status_query_and_return(dwCurrentState: initial_state)
         end
 
-        expect { subject.send(action, mock_service_name) }.to raise_error(Puppet::Error)
+        expect { subject.send(action, mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
     end
   end
@@ -317,14 +320,14 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
     context "when the service control manager cannot be opened" do
       let(:scm) { FFI::Pointer::NULL_HANDLE }
       it "raises a puppet error" do
-        expect{ subject.start(mock_service_name) }.to raise_error(Puppet::Error)
+        expect{ subject.start(mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
     end
 
     context "when the service cannot be opened" do
       let(:service) { FFI::Pointer::NULL_HANDLE }
       it "raises a puppet error" do
-        expect{ subject.start(mock_service_name) }.to raise_error(Puppet::Error)
+        expect{ subject.start(mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
     end
 
@@ -338,33 +341,33 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
         service::SERVICE_START_PENDING
       ]
       final_state = service::SERVICE_RUNNING
-  
+
       include_examples "a service action that transitions the service state", :start, valid_initial_states, service::SERVICE_START_PENDING, final_state do
         let(:initial_state) { subject::SERVICE_STOPPED }
         let(:mock_state_transition) do
           lambda do
-            allow(subject).to receive(:StartServiceW).and_return(1)
+            subject.stubs(:StartServiceW).returns(1)
           end
         end
       end
-  
+
       it "raises a Puppet::Error if StartServiceW returns false" do
         expect_successful_status_query_and_return(dwCurrentState: subject::SERVICE_STOPPED)
-  
-        expect(subject).to receive(:StartServiceW).and_return(FFI::WIN32_FALSE)
 
-        expect { subject.start(mock_service_name) }.to raise_error(Puppet::Error)
+        subject.expects(:StartServiceW).returns(FFI::WIN32_FALSE)
+
+        expect { subject.start(mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
-  
+
       it "starts the service" do
         expect_successful_status_queries_and_return(
           { dwCurrentState: subject::SERVICE_STOPPED },
           { dwCurrentState: subject::SERVICE_RUNNING }
         )
-  
-        expect(subject).to receive(:StartServiceW).and_return(1)
-  
-        subject.start(mock_service_name)
+
+        subject.expects(:StartServiceW).returns(1)
+
+        subject.start(mock_service_name, timeout: timeout)
       end
     end
   end
@@ -375,14 +378,14 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
     context "when the service control manager cannot be opened" do
       let(:scm) { FFI::Pointer::NULL_HANDLE }
       it "raises a puppet error" do
-        expect{ subject.start(mock_service_name) }.to raise_error(Puppet::Error)
+        expect{ subject.start(mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
     end
 
     context "when the service cannot be opened" do
       let(:service) { FFI::Pointer::NULL_HANDLE }
       it "raises a puppet error" do
-        expect{ subject.start(mock_service_name) }.to raise_error(Puppet::Error)
+        expect{ subject.start(mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
     end
 
@@ -390,12 +393,12 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
       service = Puppet::Util::Windows::Service
       valid_initial_states = service::SERVICE_STATES.keys - [service::SERVICE_STOPPED]
       final_state = service::SERVICE_STOPPED
-  
+
       include_examples "a service action that transitions the service state", :stop, valid_initial_states, service::SERVICE_STOP_PENDING, final_state do
         let(:initial_state) { subject::SERVICE_RUNNING }
         let(:mock_state_transition) do
           lambda do
-            allow(subject).to receive(:ControlService).and_return(1)
+            subject.stubs(:ControlService).returns(1)
           end
         end
       end
@@ -403,20 +406,20 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
       it "raises a Puppet::Error if ControlService returns false" do
         expect_successful_status_query_and_return(dwCurrentState: subject::SERVICE_RUNNING)
 
-        allow(subject).to receive(:ControlService).and_return(FFI::WIN32_FALSE)
+        subject.stubs(:ControlService).returns(FFI::WIN32_FALSE)
 
-        expect { subject.stop(mock_service_name) }.to raise_error(Puppet::Error)
+        expect { subject.stop(mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
-  
+
       it "stops the service" do
         expect_successful_status_queries_and_return(
           { dwCurrentState: subject::SERVICE_RUNNING },
           { dwCurrentState: subject::SERVICE_STOPPED }
         )
 
-        expect(subject).to receive(:ControlService).and_return(1)
+        subject.expects(:ControlService).returns(1)
 
-        subject.stop(mock_service_name)
+        subject.stop(mock_service_name, timeout: timeout)
       end
     end
   end
@@ -427,14 +430,14 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
     context "when the service control manager cannot be opened" do
       let(:scm) { FFI::Pointer::NULL_HANDLE }
       it "raises a puppet error" do
-        expect{ subject.start(mock_service_name) }.to raise_error(Puppet::Error)
+        expect{ subject.start(mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
     end
 
     context "when the service cannot be opened" do
       let(:service) { FFI::Pointer::NULL_HANDLE }
       it "raises a puppet error" do
-        expect{ subject.start(mock_service_name) }.to raise_error(Puppet::Error)
+        expect{ subject.start(mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
     end
 
@@ -446,7 +449,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
         service::SERVICE_CONTINUE_PENDING
       ]
       final_state = service::SERVICE_RUNNING
-  
+
       include_examples "a service action that transitions the service state", :resume, valid_initial_states, service::SERVICE_CONTINUE_PENDING, final_state do
         let(:initial_state) { service::SERVICE_PAUSED }
         let(:mock_state_transition) do
@@ -456,7 +459,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
             # performing the transition (in case it is in SERVICE_PAUSE_PENDING).
             expect_successful_status_query_and_return(dwCurrentState: subject::SERVICE_PAUSED)
 
-            allow(subject).to receive(:ControlService).and_return(1)
+            subject.stubs(:ControlService).returns(1)
           end
         end
       end
@@ -466,11 +469,11 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
           # This mocks the status query to return the SERVICE_RUNNING state by default.
           # Otherwise, we will fail the tests in the latter parts of the code where we
           # wait for the service to finish transitioning to the 'SERVICE_RUNNING' state.
-          allow(subject::SERVICE_STATUS_PROCESS).to receive(:new).and_return(dwCurrentState: subject::SERVICE_RUNNING)
+          subject::SERVICE_STATUS_PROCESS.stubs(:new).returns(dwCurrentState: subject::SERVICE_RUNNING)
 
           expect_successful_status_query_and_return(dwCurrentState: subject::SERVICE_PAUSE_PENDING)
 
-          allow(subject).to receive(:ControlService).and_return(1)
+          subject.stubs(:ControlService).returns(1)
         end
 
         include_examples "a service action waiting on a pending transition", service::SERVICE_PAUSE_PENDING do
@@ -482,11 +485,11 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
         expect_successful_status_query_and_return(dwCurrentState: subject::SERVICE_PAUSED)
         expect_successful_status_query_and_return(dwCurrentState: subject::SERVICE_PAUSED)
 
-        allow(subject).to receive(:ControlService).and_return(FFI::WIN32_FALSE)
+        subject.stubs(:ControlService).returns(FFI::WIN32_FALSE)
 
-        expect { subject.resume(mock_service_name) }.to raise_error(Puppet::Error)
+        expect { subject.resume(mock_service_name, timeout: timeout) }.to raise_error(Puppet::Error)
       end
-  
+
       it "resumes the service" do
         expect_successful_status_queries_and_return(
           { dwCurrentState: subject::SERVICE_PAUSED },
@@ -494,9 +497,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
           { dwCurrentState: subject::SERVICE_RUNNING }
         )
 
-        expect(subject).to receive(:ControlService).and_return(1)
+        subject.expects(:ControlService).returns(1)
 
-        subject.resume(mock_service_name)
+        subject.resume(mock_service_name, timeout: timeout)
       end
     end
   end
@@ -564,6 +567,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
     end
 
     context "when the service can be opened" do
+
       # We need to guard this section explicitly since rspec will always
       # construct all examples, even if it isn't going to run them.
       if Puppet.features.microsoft_windows?
@@ -580,10 +584,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
           end
         end
       end
-
       it "raises a puppet error if the service query fails" do
-        expect(subject).to receive(:QueryServiceConfigW)
-        expect(subject).to receive(:QueryServiceConfigW).and_return(FFI::WIN32_FALSE)
+        subject.expects(:QueryServiceConfigW).in_sequence(status_checks)
+        subject.expects(:QueryServiceConfigW).in_sequence(status_checks).returns(FFI::WIN32_FALSE)
         expect{ subject.service_start_type(mock_service_name) }.to raise_error(Puppet::Error)
       end
     end
@@ -608,7 +611,7 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
 
     context "when the service can be opened" do
       it "Raises an error on an unsuccessful change" do
-        expect(subject).to receive(:ChangeServiceConfigW).and_return(FFI::WIN32_FALSE)
+        subject.expects(:ChangeServiceConfigW).returns(FFI::WIN32_FALSE)
         expect{ subject.set_startup_mode(mock_service_name, :SERVICE_DEMAND_START) }.to raise_error(Puppet::Error)
       end
     end
@@ -626,36 +629,36 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
 
     context "when the service control manager is open" do
       let(:cursor) { [ 'svc1', 'svc2', 'svc3' ] }
-      let(:svc1name_ptr) { double() }
-      let(:svc2name_ptr) { double() }
-      let(:svc3name_ptr) { double() }
-      let(:svc1displayname_ptr) { double() }
-      let(:svc2displayname_ptr) { double() }
-      let(:svc3displayname_ptr) { double() }
+      let(:svc1name_ptr) { mock() }
+      let(:svc2name_ptr) { mock() }
+      let(:svc3name_ptr) { mock() }
+      let(:svc1displayname_ptr) { mock() }
+      let(:svc2displayname_ptr) { mock() }
+      let(:svc3displayname_ptr) { mock() }
       let(:svc1) { { :lpServiceName => svc1name_ptr, :lpDisplayName => svc1displayname_ptr, :ServiceStatusProcess => 'foo' } }
       let(:svc2) { { :lpServiceName => svc2name_ptr, :lpDisplayName => svc2displayname_ptr, :ServiceStatusProcess => 'foo' } }
       let(:svc3) { { :lpServiceName => svc3name_ptr, :lpDisplayName => svc3displayname_ptr, :ServiceStatusProcess => 'foo' } }
 
       it "Raises an error if EnumServicesStatusExW fails" do
-        expect(subject).to receive(:EnumServicesStatusExW)
-        expect(subject).to receive(:EnumServicesStatusExW).and_return(FFI::WIN32_FALSE)
+        subject.expects(:EnumServicesStatusExW).in_sequence(pointer_sequence)
+        subject.expects(:EnumServicesStatusExW).in_sequence(pointer_sequence).returns(FFI::WIN32_FALSE)
         expect{ subject.services }.to raise_error(Puppet::Error)
       end
 
       it "Reads the buffer using pointer arithmetic to create a hash of service entries" do
         # the first read_dword is for reading the bytes required, let that return 3 too.
         # the second read_dword will actually read the number of services returned
-        expect(pointer).to receive(:read_dword).twice.and_return(3)
-        expect(FFI::Pointer).to receive(:new).with(subject::ENUM_SERVICE_STATUS_PROCESSW, pointer).and_return(cursor)
-        expect(subject::ENUM_SERVICE_STATUS_PROCESSW).to receive(:new).with('svc1').and_return(svc1)
-        expect(subject::ENUM_SERVICE_STATUS_PROCESSW).to receive(:new).with('svc2').and_return(svc2)
-        expect(subject::ENUM_SERVICE_STATUS_PROCESSW).to receive(:new).with('svc3').and_return(svc3)
-        expect(svc1name_ptr).to receive(:read_arbitrary_wide_string_up_to).and_return('svc1')
-        expect(svc2name_ptr).to receive(:read_arbitrary_wide_string_up_to).and_return('svc2')
-        expect(svc3name_ptr).to receive(:read_arbitrary_wide_string_up_to).and_return('svc3')
-        expect(svc1displayname_ptr).to receive(:read_arbitrary_wide_string_up_to).and_return('service 1')
-        expect(svc2displayname_ptr).to receive(:read_arbitrary_wide_string_up_to).and_return('service 2')
-        expect(svc3displayname_ptr).to receive(:read_arbitrary_wide_string_up_to).and_return('service 3')
+        pointer.expects(:read_dword).twice.returns(3)
+        FFI::Pointer.expects(:new).with(subject::ENUM_SERVICE_STATUS_PROCESSW, pointer).returns(cursor)
+        subject::ENUM_SERVICE_STATUS_PROCESSW.expects(:new).in_sequence(pointer_sequence).with('svc1').returns(svc1)
+        subject::ENUM_SERVICE_STATUS_PROCESSW.expects(:new).in_sequence(pointer_sequence).with('svc2').returns(svc2)
+        subject::ENUM_SERVICE_STATUS_PROCESSW.expects(:new).in_sequence(pointer_sequence).with('svc3').returns(svc3)
+        svc1name_ptr.expects(:read_arbitrary_wide_string_up_to).returns('svc1')
+        svc2name_ptr.expects(:read_arbitrary_wide_string_up_to).returns('svc2')
+        svc3name_ptr.expects(:read_arbitrary_wide_string_up_to).returns('svc3')
+        svc1displayname_ptr.expects(:read_arbitrary_wide_string_up_to).returns('service 1')
+        svc2displayname_ptr.expects(:read_arbitrary_wide_string_up_to).returns('service 2')
+        svc3displayname_ptr.expects(:read_arbitrary_wide_string_up_to).returns('service 3')
         expect(subject.services).to eq({
           'svc1' => { :display_name => 'service 1', :service_status_process => 'foo' },
           'svc2' => { :display_name => 'service 2', :service_status_process => 'foo' },