Skip to content
Browse files

r3576@sedna: jeremy | 2005-10-13 11:31:50 -0700

 Update fcgi_dispatcher_test for old changes to the FCGI handler: processing attr was removed, USR1 behaves the same (sets when_ready = :exit) whether or not currently handling request.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2555 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 9a7ff14 commit 6627b828a16ff922343cd3bd2c307600d588c493 @jeremy jeremy committed Oct 13, 2005
Showing with 3 additions and 9 deletions.
  1. +3 −9 railties/test/fcgi_dispatcher_test.rb
View
12 railties/test/fcgi_dispatcher_test.rb
@@ -53,7 +53,6 @@ def test_uninterrupted_processing
@handler.process!
assert_nil @handler.exit_code
assert_nil @handler.when_ready
- assert !@handler.processing
end
def test_interrupted_via_HUP_when_not_in_request
@@ -64,7 +63,6 @@ def test_interrupted_via_HUP_when_not_in_request
@handler.thread.join
assert_nil @handler.exit_code
assert_nil @handler.when_ready
- assert !@handler.processing
assert @handler.reloaded
end
@@ -76,7 +74,6 @@ def test_interrupted_via_HUP_when_in_request
@handler.thread.join
assert_nil @handler.exit_code
assert_equal :reload, @handler.when_ready
- assert !@handler.processing
end
def test_interrupted_via_USR1_when_not_in_request
@@ -85,9 +82,8 @@ def test_interrupted_via_USR1_when_not_in_request
sleep 0.1 # let the thread get started
@handler.send_signal("USR1")
@handler.thread.join
- assert_equal 0, @handler.exit_code
- assert_nil @handler.when_ready
- assert !@handler.processing
+ assert_nil @handler.exit_code
+ assert_equal :exit, @handler.when_ready
end
def test_interrupted_via_USR1_when_in_request
@@ -97,8 +93,7 @@ def test_interrupted_via_USR1_when_in_request
@handler.send_signal("USR1")
@handler.thread.join
assert_nil @handler.exit_code
- assert @handler.when_ready
- assert !@handler.processing
+ assert_equal :exit, @handler.when_ready
end
%w(RuntimeError SignalException).each do |exception|
@@ -176,6 +171,5 @@ def test_periodic_gc
assert_nil @handler.exit_code
assert_nil @handler.when_ready
- assert !@handler.processing
end
end

0 comments on commit 6627b82

Please sign in to comment.
Something went wrong with that request. Please try again.