0
@@ -59,11 +59,12 @@
0
     @handler.process!
0
   end
0
 
0
-  def test_restart_handler
0
+  def test_restart_handler_outside_request
0
     @handler.expects(:dispatcher_log).with(:info, "asked to restart ASAP")
0
+    @handler.expects(:restart!).once
0
 
0
     @handler.send(:restart_handler, nil)
0
-    assert_equal :restart, @handler.when_ready
0
+    assert_equal nil, @handler.when_ready
0
   end
0
 
0
   def test_install_signal_handler_should_log_on_bad_signal
0
@@ -131,7 +132,7 @@
0
   def test_interrupted_via_HUP_when_not_in_request
0
     cgi = mock
0
     FCGI.expects(:each_cgi).once.yields(cgi)
0
-    @handler.expects(:gc_countdown).returns { Process.kill 'HUP', $$ }
0
+    @handler.expects(:gc_countdown).returns(lambda { Process.kill 'HUP', $$ } )
0
 
0
     @handler.expects(:reload!).once
0
     @handler.expects(:close_connection).never
0
@@ -144,7 +145,7 @@
0
   def test_interrupted_via_HUP_when_in_request
0
     cgi = mock
0
     FCGI.expects(:each_cgi).once.yields(cgi)
0
-    Dispatcher.expects(:dispatch).with(cgi).returns { Process.kill 'HUP', $$ }
0
+    Dispatcher.expects(:dispatch).with(cgi).returns( lambda { Process.kill 'HUP', $$ } )
0
 
0
     @handler.expects(:reload!).once
0
     @handler.expects(:close_connection).never
0
@@ -157,7 +158,7 @@
0
   def test_interrupted_via_USR1_when_not_in_request
0
     cgi = mock
0
     FCGI.expects(:each_cgi).once.yields(cgi)
0
-    @handler.expects(:gc_countdown).returns { Process.kill 'USR1', $$ }
0
+    @handler.expects(:gc_countdown).returns( lambda { Process.kill 'USR1', $$ } )
0
     @handler.expects(:exit_handler).never
0
 
0
     @handler.expects(:reload!).never
0
@@ -171,7 +172,7 @@
0
   def test_interrupted_via_USR1_when_in_request
0
     cgi = mock
0
     FCGI.expects(:each_cgi).once.yields(cgi)
0
-    Dispatcher.expects(:dispatch).with(cgi).returns { Process.kill 'USR1', $$ }
0
+    Dispatcher.expects(:dispatch).with(cgi).returns( lambda { Process.kill 'USR1', $$ } )
0
 
0
     @handler.expects(:reload!).never
0
     @handler.expects(:close_connection).with(cgi).once
0
0
@@ -181,10 +182,25 @@
0
     assert_equal :exit, @handler.when_ready
0
   end
0
 
0
+  def test_restart_via_USR2_when_in_request
0
+    cgi = mock
0
+    FCGI.expects(:each_cgi).once.yields(cgi)
0
+    @handler.expects(:gc_countdown).returns( lambda { Process.kill 'USR2', $$ } )
0
+    @handler.expects(:exit_handler).never
0
+
0
+    @handler.expects(:reload!).never
0
+    @handler.expects(:close_connection).with(cgi).once
0
+    @handler.expects(:exit).never
0
+    @handler.expects(:restart!).once
0
+
0
+    @handler.process!
0
+    assert_equal :restart, @handler.when_ready
0
+  end
0
+
0
   def test_interrupted_via_TERM
0
     cgi = mock
0
     FCGI.expects(:each_cgi).once.yields(cgi)
0
-    Dispatcher.expects(:dispatch).with(cgi).returns { Process.kill 'TERM', $$ }
0
+    Dispatcher.expects(:dispatch).with(cgi).returns(lambda { Process.kill 'TERM', $$ })
0
 
0
     @handler.expects(:reload!).never
0
     @handler.expects(:close_connection).never