Merge branch 'ticket/2.7.x/maint-stub_trap' into 2.7.x

* ticket/2.7.x/maint-stub_trap:
  maint: move trap call to Signal so we can stub it for specs

4 files changed, 2 insertions, 8 deletions

diff --git a/lib/puppet/application/device.rb b/lib/puppet/application/device.rb
index df5bac26a..3e2dec98c 100644
--- a/lib/puppet/application/device.rb
+++ b/lib/puppet/application/device.rb
@@ -11,7 +11,7 @@ class Puppet::Application::Device < Puppet::Application
 
   def preinit
     # Do an initial trap, so that cancels don't get a stack trace.
-    trap(:INT) do
+    Signal.trap(:INT) do
       $stderr.puts "Cancelling startup"
       exit(0)
     end
diff --git a/spec/monkey_patches/disable_signal_trap.rb b/spec/monkey_patches/disable_signal_trap.rb
deleted file mode 100644
index 5159626e3..000000000
--- a/spec/monkey_patches/disable_signal_trap.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Signal
-  def trap(*args)
-    # The goggles, they do nothing!
-  end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6b6b1c2fb..79fda18ee 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -23,7 +23,6 @@ require 'puppet_spec/fixtures'
 require 'puppet_spec/matchers'
 require 'monkey_patches/alias_should_to_must'
 require 'monkey_patches/publicize_methods'
-require 'monkey_patches/disable_signal_trap'
 
 Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
   require behaviour.relative_path_from(Pathname.new(dir))
diff --git a/spec/unit/application/device_spec.rb b/spec/unit/application/device_spec.rb
index df8cd3eaf..542bdd838 100755
--- a/spec/unit/application/device_spec.rb
+++ b/spec/unit/application/device_spec.rb
@@ -40,7 +40,7 @@ describe Puppet::Application::Device do
     end
 
     it "should catch INT" do
-      @device.expects(:trap).with { |arg,block| arg == :INT }
+      Signal.expects(:trap).with { |arg,block| arg == :INT }
 
       @device.preinit
     end