Skip to content

Commit 4ae8631

Browse files
committed
Restore original signal handler in test_timeout_in_trap_handler
1 parent e5bc1de commit 4ae8631

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

test/test_timeout.rb

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,9 @@ def test_timeout_in_trap_handler
427427

428428
rd, wr = IO.pipe
429429

430-
signal = Signal.list["USR1"] ? :USR1 : :TERM
430+
signal = :TERM
431431

432-
trap(signal) do
432+
original_handler = trap(signal) do
433433
begin
434434
Timeout.timeout(0.1) do
435435
sleep 1
@@ -444,9 +444,13 @@ def test_timeout_in_trap_handler
444444
end
445445
end
446446

447-
Process.kill signal, Process.pid
447+
begin
448+
Process.kill signal, Process.pid
448449

449-
assert_equal "OK", rd.read
450-
rd.close
450+
assert_equal "OK", rd.read
451+
rd.close
452+
ensure
453+
trap(signal, original_handler)
454+
end
451455
end
452456
end

0 commit comments

Comments
 (0)