Skip to content

Commit 87d4bd5

Browse files
committed
Always use the @saved_trap to check the previous trap in Signal.trap specs
* Remove unused code in the before(:each) trap.
1 parent 3abd56b commit 87d4bd5

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

spec/ruby/core/signal/trap_spec.rb

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
describe "Signal.trap" do
55
before :each do
66
ScratchPad.clear
7-
8-
@proc = lambda { ScratchPad.record :proc_trap }
7+
@proc = -> {}
98
@saved_trap = Signal.trap(:HUP, @proc)
109
end
1110

@@ -55,22 +54,22 @@
5554

5655
it "accepts :DEFAULT in place of a proc" do
5756
Signal.trap :HUP, :DEFAULT
58-
Signal.trap(:HUP, :DEFAULT).should == "DEFAULT"
57+
Signal.trap(:HUP, @saved_trap).should == "DEFAULT"
5958
end
6059

6160
it "accepts :SIG_DFL in place of a proc" do
6261
Signal.trap :HUP, :SIG_DFL
63-
Signal.trap(:HUP, :SIG_DFL).should == "DEFAULT"
62+
Signal.trap(:HUP, @saved_trap).should == "DEFAULT"
6463
end
6564

6665
it "accepts :SIG_IGN in place of a proc" do
6766
Signal.trap :HUP, :SIG_IGN
68-
Signal.trap(:HUP, :SIG_IGN).should == "IGNORE"
67+
Signal.trap(:HUP, @saved_trap).should == "IGNORE"
6968
end
7069

7170
it "accepts :IGNORE in place of a proc" do
7271
Signal.trap :HUP, :IGNORE
73-
Signal.trap(:HUP, :IGNORE).should == "IGNORE"
72+
Signal.trap(:HUP, @saved_trap).should == "IGNORE"
7473
end
7574

7675
it "accepts 'SIG_DFL' in place of a proc" do
@@ -85,12 +84,12 @@
8584

8685
it "accepts 'SIG_IGN' in place of a proc" do
8786
Signal.trap :HUP, "SIG_IGN"
88-
Signal.trap(:HUP, "SIG_IGN").should == "IGNORE"
87+
Signal.trap(:HUP, @saved_trap).should == "IGNORE"
8988
end
9089

9190
it "accepts 'IGNORE' in place of a proc" do
9291
Signal.trap :HUP, "IGNORE"
93-
Signal.trap(:HUP, "IGNORE").should == "IGNORE"
92+
Signal.trap(:HUP, @saved_trap).should == "IGNORE"
9493
end
9594

9695
it "accepts long names as Strings" do

0 commit comments

Comments
 (0)