Ticket #11471: fcgi_handler_fix_and_tests_update.diff
| File fcgi_handler_fix_and_tests_update.diff, 2.4 kB (added by guillaume, 7 months ago) |
|---|
-
railties/test/fcgi_dispatcher_test.rb
old new 131 131 def test_interrupted_via_HUP_when_not_in_request 132 132 cgi = mock 133 133 FCGI.expects(:each_cgi).once.yields(cgi) 134 @handler.expects(:gc_countdown).returns { Process.kill 'HUP', $$ }134 @handler.expects(:gc_countdown).returns(lambda { Process.kill 'HUP', $$ } ) 135 135 136 136 @handler.expects(:reload!).once 137 137 @handler.expects(:close_connection).never … … 144 144 def test_interrupted_via_HUP_when_in_request 145 145 cgi = mock 146 146 FCGI.expects(:each_cgi).once.yields(cgi) 147 Dispatcher.expects(:dispatch).with(cgi).returns { Process.kill 'HUP', $$ }147 Dispatcher.expects(:dispatch).with(cgi).returns( lambda { Process.kill 'HUP', $$ } ) 148 148 149 149 @handler.expects(:reload!).once 150 150 @handler.expects(:close_connection).never … … 157 157 def test_interrupted_via_USR1_when_not_in_request 158 158 cgi = mock 159 159 FCGI.expects(:each_cgi).once.yields(cgi) 160 @handler.expects(:gc_countdown).returns { Process.kill 'USR1', $$ }160 @handler.expects(:gc_countdown).returns( lambda { Process.kill 'USR1', $$ } ) 161 161 @handler.expects(:exit_handler).never 162 162 163 163 @handler.expects(:reload!).never … … 171 171 def test_interrupted_via_USR1_when_in_request 172 172 cgi = mock 173 173 FCGI.expects(:each_cgi).once.yields(cgi) 174 Dispatcher.expects(:dispatch).with(cgi).returns { Process.kill 'USR1', $$ }174 Dispatcher.expects(:dispatch).with(cgi).returns( lambda { Process.kill 'USR1', $$ } ) 175 175 176 176 @handler.expects(:reload!).never 177 177 @handler.expects(:close_connection).with(cgi).once … … 184 184 def test_interrupted_via_TERM 185 185 cgi = mock 186 186 FCGI.expects(:each_cgi).once.yields(cgi) 187 Dispatcher.expects(:dispatch).with(cgi).returns { Process.kill 'TERM', $$ }187 Dispatcher.expects(:dispatch).with(cgi).returns(lambda { Process.kill 'TERM', $$ }) 188 188 189 189 @handler.expects(:reload!).never 190 190 @handler.expects(:close_connection).never -
railties/lib/fcgi_handler.rb
old new 93 93 end 94 94 95 95 def process_request(cgi) 96 @when_ready = nil97 96 gc_countdown 98 97 99 98 with_signal_handler 'USR1' do
