Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 9220

Show
Ignore:
Timestamp:
04/03/08 20:00:33 (5 months ago)
Author:
bitsweat
Message:

Update fcgi dispatcher test cases. Closes #11471 [guillaume]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/railties/test/fcgi_dispatcher_test.rb

    r8568 r9220  
    6060  end 
    6161 
    62   def test_restart_handler 
     62  def test_restart_handler_outside_request 
    6363    @handler.expects(:dispatcher_log).with(:info, "asked to restart ASAP") 
     64    @handler.expects(:restart!).once 
    6465 
    6566    @handler.send(:restart_handler, nil) 
    66     assert_equal :restart, @handler.when_ready 
     67    assert_equal nil, @handler.when_ready 
    6768  end 
    6869 
    …… 
    132133    cgi = mock 
    133134    FCGI.expects(:each_cgi).once.yields(cgi) 
    134     @handler.expects(:gc_countdown).returns { Process.kill 'HUP', $$ } 
     135    @handler.expects(:gc_countdown).returns(lambda { Process.kill 'HUP', $$ } ) 
    135136 
    136137    @handler.expects(:reload!).once 
    …… 
    145146    cgi = mock 
    146147    FCGI.expects(:each_cgi).once.yields(cgi) 
    147     Dispatcher.expects(:dispatch).with(cgi).returns { Process.kill 'HUP', $$ } 
     148    Dispatcher.expects(:dispatch).with(cgi).returns( lambda { Process.kill 'HUP', $$ } ) 
    148149 
    149150    @handler.expects(:reload!).once 
    …… 
    158159    cgi = mock 
    159160    FCGI.expects(:each_cgi).once.yields(cgi) 
    160     @handler.expects(:gc_countdown).returns { Process.kill 'USR1', $$ } 
     161    @handler.expects(:gc_countdown).returns( lambda { Process.kill 'USR1', $$ } ) 
    161162    @handler.expects(:exit_handler).never 
    162163 
    …… 
    172173    cgi = mock 
    173174    FCGI.expects(:each_cgi).once.yields(cgi) 
    174     Dispatcher.expects(:dispatch).with(cgi).returns { Process.kill 'USR1', $$ } 
     175    Dispatcher.expects(:dispatch).with(cgi).returns( lambda { Process.kill 'USR1', $$ } ) 
    175176 
    176177    @handler.expects(:reload!).never 
    …… 
    182183  end 
    183184 
     185  def test_restart_via_USR2_when_in_request 
     186    cgi = mock 
     187    FCGI.expects(:each_cgi).once.yields(cgi) 
     188    @handler.expects(:gc_countdown).returns( lambda { Process.kill 'USR2', $$ } ) 
     189    @handler.expects(:exit_handler).never 
     190 
     191    @handler.expects(:reload!).never 
     192    @handler.expects(:close_connection).with(cgi).once 
     193    @handler.expects(:exit).never 
     194    @handler.expects(:restart!).once 
     195 
     196    @handler.process! 
     197    assert_equal :restart, @handler.when_ready 
     198  end 
     199 
    184200  def test_interrupted_via_TERM 
    185201    cgi = mock 
    186202    FCGI.expects(:each_cgi).once.yields(cgi) 
    187     Dispatcher.expects(:dispatch).with(cgi).returns { Process.kill 'TERM', $$ } 
     203    Dispatcher.expects(:dispatch).with(cgi).returns(lambda { Process.kill 'TERM', $$ }) 
    188204 
    189205    @handler.expects(:reload!).never