From 6627b828a16ff922343cd3bd2c307600d588c493 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 13 Oct 2005 19:05:48 +0000
Subject:  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
---
 railties/test/fcgi_dispatcher_test.rb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/fcgi_dispatcher_test.rb b/railties/test/fcgi_dispatcher_test.rb
index 1d9b6fafaf..2a88e91ea5 100644
--- a/railties/test/fcgi_dispatcher_test.rb
+++ b/railties/test/fcgi_dispatcher_test.rb
@@ -53,7 +53,6 @@ class RailsFCGIHandlerTest < Test::Unit::TestCase
     @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 @@ class RailsFCGIHandlerTest < Test::Unit::TestCase
     @handler.thread.join
     assert_nil @handler.exit_code
     assert_nil @handler.when_ready
-    assert !@handler.processing
     assert @handler.reloaded
   end
 
@@ -76,7 +74,6 @@ class RailsFCGIHandlerTest < Test::Unit::TestCase
     @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 @@ class RailsFCGIHandlerTest < Test::Unit::TestCase
     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 @@ class RailsFCGIHandlerTest < Test::Unit::TestCase
     @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 @@ class RailsFCGIHandlerPeriodicGCTest < Test::Unit::TestCase
 
     assert_nil @handler.exit_code
     assert_nil @handler.when_ready
-    assert !@handler.processing
   end
 end
-- 
cgit v1.2.3