Skip to content

Commit c4474f0

Browse files
committed
add the term child warn tests back
1 parent e41b725 commit c4474f0

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

lib/resque/worker.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def fork(job)
266266

267267
# Runs all the methods needed when a worker begins its lifecycle.
268268
def startup
269-
warn "WARNING: This way of doing signal handling is now deprecated. Please see http://hone.heroku.com/resque/2012/08/21/resque-signals.html for more info." unless term_child
269+
Kernel.warn "WARNING: This way of doing signal handling is now deprecated. Please see http://hone.heroku.com/resque/2012/08/21/resque-signals.html for more info." unless term_child
270270
enable_gc_optimizations
271271
register_signal_handlers
272272
prune_dead_workers

test/worker_test.rb

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,5 +718,18 @@ def self.perform( run_time, rescue_time=nil )
718718
end
719719
end
720720
end
721+
722+
test "displays warning when not using term_child" do
723+
stdout, stderr = capture_io { @worker.work(0) }
724+
725+
assert stderr.match(/^WARNING:/)
726+
end
727+
728+
test "it does not display warning when using term_child" do
729+
@worker.term_child = "1"
730+
stdout, stderr = capture_io { @worker.work(0) }
731+
732+
assert !stderr.match(/^WARNING:/)
733+
end
721734
end
722735
end

0 commit comments

Comments
 (0)